bk commit into 5.1 tree (dlenev:1.2409) BUG#25044

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-20 14:08:53+03:00, dlenev@stripped +2 -0
  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@stripped, 2007-01-20 14:08:50+03:00, dlenev@stripped +1 -1
    Fixed "show binlog events" usage as 5.1 and 5.0 sizes of binlog
    events differ.

  mysql-test/t/alter_table-big.test@stripped, 2007-01-20 14:08:50+03:00, dlenev@stripped +2 -2
    This test needs statement based binlogging.
    Also fixed "show binlog events" usage as 5.1 and 5.0 sizes
    of binlog events differ.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.1-bg25044

--- 1.1/mysql-test/r/alter_table-big.result	2007-01-20 14:08:59 +03:00
+++ 1.2/mysql-test/r/alter_table-big.result	2007-01-20 14:08:59 +03:00
@@ -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

--- 1.1/mysql-test/t/alter_table-big.test	2007-01-20 14:08:59 +03:00
+++ 1.2/mysql-test/t/alter_table-big.test	2007-01-20 14:08:59 +03:00
@@ -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;