Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

mysql-test/r/isam.result

@@ -49,14 +49,14 @@ test.t1	optimize	status	OK
 check table t1,t2;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
-test.t2	check	error	The handler for the table doesn't support check
+test.t2	check	error	The storage enginge for the table doesn't support check
 repair table t1,t2;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	status	OK
-test.t2	repair	error	The handler for the table doesn't support repair
+test.t2	repair	error	The storage enginge for the table doesn't support repair
 check table t2,t1;
 Table	Op	Msg_type	Msg_text
-test.t2	check	error	The handler for the table doesn't support check
+test.t2	check	error	The storage enginge for the table doesn't support check
 test.t1	check	status	OK
 lock tables t1 write;
 check table t2,t1;

mysql-test/r/rpl_flush_tables.result

@@ -14,7 +14,7 @@ rename table t1 to t5, t2 to t1;
 flush no_write_to_binlog tables;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	4	Start	1	4	Server ver: 4.1.1-alpha-debug-log, Binlog ver: 3
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 master-bin.000001	79	Query	1	79	use `test`; create table t1 (a int)
 master-bin.000001	137	Query	1	137	use `test`; insert into t1 values (10)
 master-bin.000001	198	Query	1	198	use `test`; create table t2 (a int)
@@ -27,7 +27,7 @@ a
 flush tables;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	4	Start	1	4	Server ver: 4.1.1-alpha-debug-log, Binlog ver: 3
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 master-bin.000001	79	Query	1	79	use `test`; create table t1 (a int)
 master-bin.000001	137	Query	1	137	use `test`; insert into t1 values (10)
 master-bin.000001	198	Query	1	198	use `test`; create table t2 (a int)

mysql-test/t/rpl_flush_tables.test

@@ -5,6 +5,7 @@
 #
 source include/master-slave.inc;
 
+let $VERSION=`select version()`;
 create table t1 (a int);
 insert into t1 values (10);
 create table t2 (a int);
@@ -17,12 +18,14 @@ rename table t1 to t5, t2 to t1;
 # first don't write it to the binlog, to test the NO_WRITE_TO_BINLOG keyword.
 flush no_write_to_binlog tables;
 # Check that it's not in the binlog.
+--replace_result $VERSION VERSION
 show binlog events;
 # Check that the master is not confused.
 select * from t3;
 # This FLUSH should go into the binlog to not confuse the slave.
 flush tables;
 # Check that it's in the binlog.
+--replace_result $VERSION VERSION
 show binlog events;
 save_master_pos;
 connection slave;