Commit c1a54d97 authored by unknown's avatar unknown

Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires

global 'opening tables' lock." after merging it into 5.1 tree.


mysql-test/r/alter_table-big.result:
  Fixed "show binlog events" usage as 5.1 and 5.0 sizes of binlog
  events differ.
mysql-test/t/alter_table-big.test:
  This test needs statement based binlogging.
  Also fixed "show binlog events" usage as 5.1 and 5.0 sizes
  of binlog events differ.
parent 701b785e
...@@ -9,7 +9,7 @@ reset master; ...@@ -9,7 +9,7 @@ reset master;
alter table t1 enable keys;; alter table t1 enable keys;;
insert into t2 values (1); insert into t2 values (1);
insert into t1 values (1, 1, 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 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`; insert into t2 values (1)
master-bin.000001 # Query 1 # use `test`; alter table t1 enable keys master-bin.000001 # Query 1 # use `test`; alter table t1 enable keys
......
# In order to be more or less robust test for bug#25044 has to take # 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) # significant time (e.g. about 9 seconds on my (Dmitri's) computer)
# so we probably want execute it only in --big-test mode. # 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/big_test.inc
--source include/have_binlog_format_mixed_or_statement.inc
# #
...@@ -53,7 +53,7 @@ connection default; ...@@ -53,7 +53,7 @@ connection default;
--reap --reap
# Check that statements were executed/binlogged in correct order. # Check that statements were executed/binlogged in correct order.
--replace_column 2 # 5 # --replace_column 2 # 5 #
show binlog events in 'master-bin.000001' from 98; show binlog events in 'master-bin.000001' from 102;
# Clean up # Clean up
drop tables t1, t2; drop tables t1, t2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment