Commit graph

51444 commits

Author SHA1 Message Date
davi@mysql.com/endora.local
ee9bafc1c5 Bug#22312 Syntax error in expression with INTERVAL()
Parser rejects valid INTERVAL() expressions when associated with
arithmetic operators. The problem is the way in which the expression
and interval grammar rules were organized caused shift/reduce conflicts.

The solution is to tweak the interval rules to avoid shift/reduce
conflicts by removing the broken interval_expr rule and explicitly
specify it's content where necessary.

Original fix by Davi Arnaut, revised and improved rules by Marc Alff
2007-11-30 09:34:25 -02:00
davi@mysql.com/endora.local
d179bb64c2 Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock
This bug is actually two bugs in one, one of which is CREATE TRIGGER under
LOCK TABLES and the other is CREATE TRIGGER under LOCK TABLES simultaneous
to a FLUSH TABLES WITH READ LOCK (global read lock). Both situations could
lead to a server crash or deadlock.

The first problem arises from the fact that when under LOCK TABLES, if the
table is in the set of locked tables, the table is already open and it doesn't
need to be reopened (not a placeholder). Also in this case, if the table is
not write locked, a exclusive lock can't be acquired because of a possible
deadlock with another thread also holding a (read) lock on the table. The
second issue arises from the fact that one should never wait for a global
read lock if it's holding any locked tables, because the global read lock
is waiting for these tables and this leads to a circular wait deadlock.

The solution for the first case is to check if the table is write locked
and upgraded the write lock to a exclusive lock and fail otherwise for non
write locked tables. Grabbin the exclusive lock in this case also means
to ensure that the table is opened only by the calling thread. The second
issue is partly fixed by not waiting for the global read lock if the thread
is holding any locked tables.

The second issue is only partly addressed in this patch because it turned
out to be much wider and also affects other DDL statements. Reported as
Bug#32395
2007-11-29 09:42:26 -02:00
malff@lambda.hsd1.co.comcast.net.
de0175204d Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 09:08:31 -07:00
malff@lambda.hsd1.co.comcast.net.
a8bb772392 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 08:49:01 -07:00
malff@lambda.hsd1.co.comcast.net.
fce47dbc9a Manual merge 2007-11-28 08:41:45 -07:00
malff@lambda.hsd1.co.comcast.net.
4e8f8a0178 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 07:42:36 -07:00
davi@endora.local
edd225ff55 Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-11-28 12:33:51 -02:00
malff@lambda.hsd1.co.comcast.net.
7c4f906bf3 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-28 07:23:51 -07:00
davi@endora.local
7441f466e2 Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
into  mysql.com:/Users/davi/mysql/mysql-5.0-runtime
2007-11-28 10:49:30 -02:00
davi@mysql.com/endora.local
bd3f76d767 Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
Kill of a CREATE TABLE source_table LIKE statement waiting for a
name-lock on the source table causes a bad lock interaction.

The mysql_create_like_table() has a bug that if the connection is
killed while waiting for the name-lock on the source table, it will
jump to the wrong error path and try to unlock the source table and
LOCK_open, but both weren't locked.

The solution is to simple return when the name lock request is killed,
it's safe to do so because no lock was acquired and no cleanup is needed.

Original bug report also contains description of other problems
related to this scenario but they either already fixed in 5.1 or
will be addressed separately (see bug report for details).
2007-11-28 10:18:01 -02:00
istruewing@stella.local
1a87a089a7 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-28 11:06:40 +01:00
istruewing@stella.local
4d38a04665 Bug#8693 Test 'rpl_log_pos' fails sometimes
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
2007-11-28 10:00:23 +01:00
istruewing@stella.local
02e321d350 Bug#29149 Test "kill" fails on Windows
Disabled test case.
2007-11-28 09:48:06 +01:00
thek@adventure.(none)
c2c84976d1 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-11-28 09:04:49 +01:00
thek@adventure.(none)
906697768c Error number increased; fixing broken number. 2007-11-28 09:03:21 +01:00
istruewing@stella.local
63e48ec22c Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 20:30:03 +01:00
istruewing@stella.local
da28f9eac4 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 19:29:10 +01:00
istruewing@stella.local
777d79f5fd Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 18:42:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e2fa11fb50 after-merge fixup: archive test/result adjusted. 2007-11-27 21:30:00 +04:00
istruewing@stella.local
c389535ae9 Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 17:34:03 +01:00
istruewing@stella.local
a167dd0bf4 Bug#8693 Test 'rpl_log_pos' fails sometimes
Disabled the test case.
2007-11-27 17:28:55 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
f03fb473b3 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 20:03:09 +04:00
malff@lambda.hsd1.co.comcast.net.
fc76a4824a Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-27 09:03:04 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
4344785894 Merge mysql.com:/home/ram/work/mysql-5.1-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.1
2007-11-27 20:00:50 +04:00
malff@lambda.hsd1.co.comcast.net.
352e59b37b Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-27 08:56:43 -07:00
istruewing@stella.local
a39180c1f2 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 16:24:44 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
14e74e82e8 Merge mysql.com:/home/ram/work/mysql-5.0-engines
into  mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 15:15:28 +04:00
mkindahl@dl145h.mysql.com
b1428496df Disabling several tests that fail and reported as errors. 2007-11-27 11:02:00 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d20dcd2421 after-merge fix:
- archive test/result adjusted.
  - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.
2007-11-27 12:28:08 +04:00
istruewing@stella.local
13f317c565 Bug#32754 - InnoDB tests do not prepare or clean up correctly
Some test cases were missing preparation to deal with failed
predecessor test cases.

Added preparation (drop table if exists) to some test cases.
2007-11-27 09:25:45 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
32f9164bb5 Merge mysql.com:/home/ram/work/b30495/b30495.5.0
into  mysql.com:/home/ram/work/b30495/b30495.5.1
2007-11-27 10:14:46 +04:00
msvensson@pilot.mysql.com
f035f5e05d Merge pilot.mysql.com:/data/msvensson/mysql/bug32429/my50-bug32429
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2007-11-26 20:08:32 +01:00
msvensson@pilot.mysql.com
ec08b4a405 Remove disabling of testcases 2007-11-26 20:05:52 +01:00
msvensson@pilot.mysql.com
f45cf3e975 Bug#25146 Some warnings/errors not shown when using --show-warnings
- Additional patch to fix compiler warnings
2007-11-26 19:50:43 +01:00
msvensson@pilot.mysql.com
385e3a895e Revert 2007-11-26 19:42:07 +01:00
thek@adventure.(none)
8d065eac6d Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-11-26 19:33:01 +01:00
thek@adventure.(none)
da93d2b363 Merge adventure.(none):/home/thek/Development/cpp/bug16470/my51-bug16470
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-11-26 19:31:41 +01:00
istruewing@stella.local
7fcf494018 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-26 19:18:21 +01:00
istruewing@stella.local
f140e7e000 Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.
2007-11-26 19:16:23 +01:00
davi@endora.local
36d3c604c1 Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0
into  mysql.com:/Users/davi/mysql/bugs/29592-5.1
2007-11-26 16:10:26 -02:00
thek@adventure.(none)
345650212c Bug#16470 crash on grant if old grant tables
Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
This caused the server to crash on any attempt to store new grants because
of uninitialized structures.

This patch breaks up the grant loading function into two phases to allow
for procs_priv table to fail with an warning instead of crashing the server.
2007-11-26 19:09:40 +01:00
istruewing@stella.local
010d82753d Moved disabling of tests to the respective suites. 2007-11-26 17:31:53 +01:00
thek@adventure.(none)
b894128b90 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-11-26 17:21:15 +01:00
davi@mysql.com/endora.local
cdad8669df Bug#29592 SQL Injection issue
Remove the mysql_odbc_escape_string() function. The function
has multi-byte character escaping issues, doesn't honor the
NO_BACKSLASH_ESCAPES mode and is not used anymore by the
Connector/ODBC as of 3.51.17.
2007-11-26 14:09:37 -02:00
msvensson@pilot.mysql.com
702361735a Fix warning about possibly uninitialized variable "warnings" 2007-11-26 16:45:58 +01:00
msvensson@pilot.mysql.com
7c739af321 Merge bk-internal:/home/bk/mysql-5.1-rpl-merge
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl-merge
2007-11-26 16:42:19 +01:00
msvensson@pilot.mysql.com
16d372ce7d Add suppressions for expected warning messages that appears in
slave's error log when running rpl_extraColmaster_*.test
2007-11-26 16:31:35 +01:00
mkindahl@dl145h.mysql.com
3f1c8ab526 Disabling testcases that have warnings that PB cannot handle. 2007-11-26 16:20:37 +01:00
msvensson@pilot.mysql.com
da8ca56667 Disable combinations processing until next version 2007-11-26 16:19:34 +01:00
istruewing@stella.local
0b62d9664a Bug#30751: rpl_ndb_multi missing row in output
Disabled the test case.
2007-11-26 16:17:26 +01:00