diff options
author | Michael Widenius <monty@mariadb.org> | 2014-03-10 14:08:12 +0200 |
---|---|---|
committer | Michael Widenius <monty@mariadb.org> | 2014-03-10 14:08:12 +0200 |
commit | b07f9f72dc131acad58fb20a188c5014312f6849 (patch) | |
tree | 01fc02926001de4761fa335d687248ba92b70a2f /mysql-test/t/create-big.test | |
parent | 5b7cab82195268f7657504d0b53995654748cefa (diff) | |
download | mariadb-git-b07f9f72dc131acad58fb20a188c5014312f6849.tar.gz |
Fixed MDEV-5780 "create-big fails in 10.0"
The issue was that create...trigger part of the test suite used a debug_sync point that before was never triggered (in other words, wrong meaningless test).
With the new create ... replace code the debug sync point is triggered and the test case could not handled that.
I fixed this by adding a wait and go for the debug syncpoint in the test.
Removed some compiler warnings from mysql_cond_timedwait
include/mysql/psi/mysql_thread.h:
Removed compiler warnings
mysql-test/r/create-big.result:
New test result
mysql-test/t/create-big.test:
Fixed test case as create_table_select_before_check_if_exists was not before triggered by the code.
Diffstat (limited to 'mysql-test/t/create-big.test')
-rw-r--r-- | mysql-test/t/create-big.test | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mysql-test/t/create-big.test b/mysql-test/t/create-big.test index 8d916f8da82..7f20a8b42af 100644 --- a/mysql-test/t/create-big.test +++ b/mysql-test/t/create-big.test @@ -420,9 +420,20 @@ set @a:=0; set debug_sync='create_table_select_before_check_if_exists SIGNAL parked WAIT_FOR go'; --send create table if not exists t1 select 1 as i; connection addconroot1; -create trigger t1_bi before insert on t1 for each row set @a:=1; +set debug_sync='now WAIT_FOR parked'; +--send create trigger t1_bi before insert on t1 for each row set @a:=1; +connection addconroot2; +# Wait until the above DROP TABLE is blocked due to CREATE TABLE +let $wait_condition= + select count(*) = 1 from information_schema.processlist + where state = "Waiting for table metadata lock" and + info like "create trigger%"; +--source include/wait_condition.inc +set debug_sync='now SIGNAL go'; connection default; --reap +connection addconroot1; +--reap connection default; select @a; select * from t1; |