b9476f7d50
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
0f75d64734
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11973-2
2005-08-11 10:39:33 +04:00
9125477df5
Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4
...
into mysql.com:/home/psergey/mysql-5.0-bug12228-r5
2005-08-10 21:17:52 +00:00
fbab5fc568
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
88b01808d9
error message fixed
2005-08-10 16:02:36 +05:00
ec5ceecab7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12280
2005-08-10 10:32:43 +04:00
51537c057d
Fix for bug #12280 "Triggers: crash if flush tables".
...
We should not allow FLUSH statement to be executed inside both triggers
and stored functions.
2005-08-10 10:31:32 +04:00
60511c3df2
Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger
...
cause crash on update".
Let us update "thd" pointer in LEX, all its units and in LEX::result before
executing statement in trigger body, since triggers are associated with TABLE
object and because of this can be used in different threads.
2005-08-10 00:23:56 +04:00
aa99bd61c0
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-09 16:35:51 +01:00
083da3ecee
Merged code.
2005-08-09 15:29:33 +03:00
c6db76b076
Fix for BUG#12228: SP cache code:
...
* Cleanup SP Cache code, now SP Cache only deletes sp_head objects in
sp_cache_flush_obsolete() invalidates all pointers to routines in the cache.
* Use new SP Cache use contract in the code.
There is no test case because it doesn't seem to be possible to cause thread races to end
the same way they end in heavy-load test. This patch removes the crash in heavy test.
2005-08-08 23:23:34 +00:00
99cb083549
Review of new pushed code
...
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
2005-08-09 00:13:49 +03:00
4cdca3486d
Merge mysql.com:/home/jimw/my/mysql-5.0-6080
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-08 10:12:24 -07:00
806b5468b8
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-08-08 00:10:07 +02:00
015447b211
Bug#10109
...
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
Ensure that check_insert_fields() is only called once when
doing an INSERT..SELECT
2005-08-07 03:16:15 +01:00
268a68ad08
Fix error message when creating a non-string field with a display
...
width beyond the maximum. (Bug #6080 )
2005-08-05 17:22:53 -07:00
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
c9e04f4642
Bug#9459 - deadlock with flush with lock, and lock table write
...
Added a check before taking a global read lock if
the own thread has a write locked table.
2005-08-05 15:37:24 +02:00
31a73da815
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7
2005-08-03 10:14:01 +00:00
f595847ec0
Manual merge
2005-08-03 03:47:07 +00:00
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
4c69fbe632
issue correct error message in case of view presence for duplicated table on update (BUG#10773)
...
frequently used command sequence replaced with inline function
2005-08-02 22:54:49 +03:00
48d111c8c2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:54:57 -07:00
ca56883011
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:12:30 -07:00
9a5560683f
Merge mysql.com:/home/jimw/my/mysql-4.1-10724
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
de02193bdd
Added Non-prelocked SP execution: Now a PROCEDURE doesn't enter/leave prelocked mode for
...
its body, but lets each statement to get/release its own locks. This allows a broader set
of statements to be executed inside PROCEDUREs (but breaks replication)
This patch should fix BUG#8072, BUG#8766, BUG#9563, BUG#11126
2005-07-30 08:19:57 +00:00
29cfa64f68
Merging
2005-07-27 14:37:16 +05:00
b17a35e06f
Merge
2005-07-27 12:39:49 +05:00
0536bd6679
Increase allowed size of stored procedure bodies to 4GB, and
...
produce a sensible error when that limit is exceeded. (Bug #11602 )
2005-07-26 18:08:49 -07:00
3409537f2a
Don't force column header to @@session.var_name if @@local.var_name
...
was used. (Bug #10724 )
2005-07-25 11:25:28 -07:00
ded44df2b5
Fix for bug #6710 (CREATE FUNCTION fails with 'Unknown error')
2005-07-23 17:21:27 +05:00
421f267b7f
Merge mysql.com:/home/jimw/my/mysql-5.0-11213
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-22 12:38:14 -07:00
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
39efcdcf7c
Merge mysql.com:/home/jimw/my/mysql-5.0-11822
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:33 -07:00
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
b141437ad3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 20:55:09 +04:00
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00
d59ff2764c
Bug#11577 'show procedure/function status' doesn't work for user with limited access
...
changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
2005-07-19 13:49:43 +05:00
aff38d8659
Handle systems where 127.0.0.1 doesn't always map to 'localhost'
...
first. (Bug #11822 )
2005-07-18 17:00:37 -07:00
52b8928b09
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
2005-07-19 00:55:37 +04:00
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
78c65b5adc
Cleanups during review
...
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
b4b874568b
Merge mysql.com:/home/jimw/my/mysql-4.1-9979
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-15 10:52:22 -07:00
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
f302759522
valgrind error fix(uninitialiased variable)
...
removed unnecessary operation
2005-07-14 15:42:36 +05:00
618f7d9449
Merge mysql.com:/opt/local/work/mysql-4.1-11458
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-13 18:05:57 +04:00
bef558b7ee
- a fix for Bug#11458 "Prepared statement with subselects return random
...
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
2005-07-13 17:38:55 +04:00
1affa6182a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-13 13:11:51 +02:00
9c3349f5c6
Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables
2005-07-13 13:30:39 +05:00
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
