diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
| commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
| tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/t/query_cache_debug.test | |
| parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
| parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
| download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz | |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'mysql-test/t/query_cache_debug.test')
| -rw-r--r-- | mysql-test/t/query_cache_debug.test | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/t/query_cache_debug.test b/mysql-test/t/query_cache_debug.test index 70b3c81168d..2f85813d1ef 100644 --- a/mysql-test/t/query_cache_debug.test +++ b/mysql-test/t/query_cache_debug.test @@ -208,17 +208,7 @@ SET DEBUG_SYNC="now WAIT_FOR parked1_2"; --echo ** until a broadcast signal reaches them causing both threads to --echo ** come alive and check the condition. SET DEBUG_SYNC="now SIGNAL go2"; ---echo ** Wait for thd2 to receive the signal -let $wait_condition= - SELECT COUNT(*) = 1 FROM information_schema.processlist - WHERE state = "Waiting for query cache lock"; ---source include/wait_condition.inc SET DEBUG_SYNC="now SIGNAL go3"; ---echo ** Wait for thd3 to receive the signal -let $wait_condition= - SELECT COUNT(*) = 2 FROM information_schema.processlist - WHERE state = "Waiting for query cache lock"; ---source include/wait_condition.inc --echo ** --echo ** Finally signal the DELETE statement on THD1 one last time. |