diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-29 18:01:33 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-29 18:01:33 +0400 |
| commit | 52f361ecb863eab4fda5e3e5b5da7f4c430e9e65 (patch) | |
| tree | 2eb9807085774f1b10d8e1032449dea5c242e76c /mysql-test/t/merge-big.test | |
| parent | 349b34b3638e70eccdbbfa98daebb5c382ab4f29 (diff) | |
| download | mariadb-git-52f361ecb863eab4fda5e3e5b5da7f4c430e9e65.tar.gz | |
A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()".
Remove mysql_lock_have_duplicate(), since now we always
have TABLE_LIST objects for MyISAMMRG children
in lex->query_tables and keep it till the end of the
statement (sub-statement).
mysql-test/r/merge.result:
Update results (Bug#54811).
mysql-test/t/merge-big.test:
Update to new wait state.
mysql-test/t/merge.test:
Add a test case for Bug#54811.
sql/lock.cc:
Remove a function that is now unused.
sql/lock.h:
Remove a function that is now unused.
sql/sql_base.cc:
Don't try to search for duplicate table among THR_LOCK objects, TABLE_LIST list contains all used tables.
Diffstat (limited to 'mysql-test/t/merge-big.test')
| -rw-r--r-- | mysql-test/t/merge-big.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/merge-big.test b/mysql-test/t/merge-big.test index 33bd93791f1..509c7742dac 100644 --- a/mysql-test/t/merge-big.test +++ b/mysql-test/t/merge-big.test @@ -51,7 +51,7 @@ connection default; #--sleep 8 #SELECT ID,STATE,INFO FROM INFORMATION_SCHEMA.PROCESSLIST; let $wait_condition= SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST - WHERE ID = $con1_id AND STATE = 'Table lock'; + WHERE ID = $con1_id AND STATE = 'Waiting for table'; --source include/wait_condition.inc #SELECT NOW(); --echo # Kick INSERT out of thr_multi_lock(). @@ -61,7 +61,7 @@ FLUSH TABLES; #--sleep 8 #SELECT ID,STATE,INFO FROM INFORMATION_SCHEMA.PROCESSLIST; let $wait_condition= SELECT 1 FROM INFORMATION_SCHEMA.PROCESSLIST - WHERE ID = $con1_id AND STATE = 'Table lock'; + WHERE ID = $con1_id AND STATE = 'Waiting for table'; --source include/wait_condition.inc #SELECT NOW(); --echo # Unlock and close table and wait for con1 to close too. |