diff options
| author | dlenev@mockturtle.local <> | 2007-01-20 14:08:53 +0300 |
|---|---|---|
| committer | dlenev@mockturtle.local <> | 2007-01-20 14:08:53 +0300 |
| commit | 8f23e65b00a927d74246e1f05272fe7a7bb9e9fc (patch) | |
| tree | d861a2279356213855f12ac8daecc14aa735d5a0 | |
| parent | 83bcfa254140453fe064dba968a70dbedd77b5b7 (diff) | |
| download | mariadb-git-8f23e65b00a927d74246e1f05272fe7a7bb9e9fc.tar.gz | |
Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires
global 'opening tables' lock." after merging it into 5.1 tree.
| -rw-r--r-- | mysql-test/r/alter_table-big.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/alter_table-big.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/alter_table-big.result b/mysql-test/r/alter_table-big.result index 873978c60de..a9d0515d6bb 100644 --- a/mysql-test/r/alter_table-big.result +++ b/mysql-test/r/alter_table-big.result @@ -9,7 +9,7 @@ reset master; alter table t1 enable keys;; insert into t2 values (1); insert into t1 values (1, 1, 1); -show binlog events in 'master-bin.000001' from 98; +show binlog events in 'master-bin.000001' from 102; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # use `test`; insert into t2 values (1) master-bin.000001 # Query 1 # use `test`; alter table t1 enable keys diff --git a/mysql-test/t/alter_table-big.test b/mysql-test/t/alter_table-big.test index 9a773f48a9c..befe6e14977 100644 --- a/mysql-test/t/alter_table-big.test +++ b/mysql-test/t/alter_table-big.test @@ -1,8 +1,8 @@ # In order to be more or less robust test for bug#25044 has to take # significant time (e.g. about 9 seconds on my (Dmitri's) computer) # so we probably want execute it only in --big-test mode. -# Also in 5.1 this test will require statement-based binlog. --source include/big_test.inc +--source include/have_binlog_format_mixed_or_statement.inc # @@ -53,7 +53,7 @@ connection default; --reap # Check that statements were executed/binlogged in correct order. --replace_column 2 # 5 # -show binlog events in 'master-bin.000001' from 98; +show binlog events in 'master-bin.000001' from 102; # Clean up drop tables t1, t2; |