bk commit into 5.0 tree (hezx:1.2561) BUG#32205

[hezx]

Below is the list of changes that have just been committed into a local
5.0 repository of hezx. When hezx 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, 2008-01-06 15:27:42+08:00, hezx@stripped +5 -0
  Fixed some test case after push of BUG#32205

  mysql-test/r/binlog_start_comment.result@stripped, 2008-01-06 15:27:40+08:00,
hezx@stripped +1 -0
    Drop tables used in the test case when done

  mysql-test/r/blackhole.result@stripped, 2008-01-06 15:27:40+08:00, hezx@stripped +2 -2
    Mask out file_id in show binlog events output

  mysql-test/r/case.result@stripped, 2008-01-06 15:27:40+08:00, hezx@stripped +1 -1
    Drop table t2 too if it exists at the start of the test

  mysql-test/t/blackhole.test@stripped, 2008-01-06 15:27:40+08:00, hezx@stripped +1 -0
    Mask out file_id in show binlog events output

  mysql-test/t/case.test@stripped, 2008-01-06 15:27:40+08:00, hezx@stripped +1 -1
    Drop table t2 too if it exists at the start of the test

diff -Nrup a/mysql-test/r/binlog_start_comment.result
b/mysql-test/r/binlog_start_comment.result
--- a/mysql-test/r/binlog_start_comment.result	2007-12-18 15:43:48 +08:00
+++ b/mysql-test/r/binlog_start_comment.result	2008-01-06 15:27:40 +08:00
@@ -12,3 +12,4 @@ flush logs;
 select * from t2;
 word
 Ada
+drop table t1,t2;
diff -Nrup a/mysql-test/r/blackhole.result b/mysql-test/r/blackhole.result
--- a/mysql-test/r/blackhole.result	2007-05-10 21:14:02 +08:00
+++ b/mysql-test/r/blackhole.result	2008-01-06 15:27:40 +08:00
@@ -115,8 +115,8 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; insert ignore into t1 values(1)
 master-bin.000001	#	Query	1	#	use `test`; replace into t1 values(100)
 master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200))
engine=blackhole
-master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
-master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t2 ;file_id=1
+master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=581
+master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile
'../std_data_ln/words.dat' into table t2 ;file_id=#
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int
 master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b
 master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1
diff -Nrup a/mysql-test/r/case.result b/mysql-test/r/case.result
--- a/mysql-test/r/case.result	2006-09-13 19:18:12 +08:00
+++ b/mysql-test/r/case.result	2008-01-06 15:27:40 +08:00
@@ -1,4 +1,4 @@
-drop table if exists t1;
+drop table if exists t1, t2;
 select CASE "b" when "a" then 1 when "b" then 2 END;
 CASE "b" when "a" then 1 when "b" then 2 END
 2
diff -Nrup a/mysql-test/t/blackhole.test b/mysql-test/t/blackhole.test
--- a/mysql-test/t/blackhole.test	2007-06-15 05:15:50 +08:00
+++ b/mysql-test/t/blackhole.test	2008-01-06 15:27:40 +08:00
@@ -128,6 +128,7 @@ select * from t3;
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
 --replace_column 2 # 5 #
+--replace_regex /file_id=[0-9]+/file_id=#/
 show binlog events;
 
 drop table t1,t2,t3;
diff -Nrup a/mysql-test/t/case.test b/mysql-test/t/case.test
--- a/mysql-test/t/case.test	2006-09-13 19:18:12 +08:00
+++ b/mysql-test/t/case.test	2008-01-06 15:27:40 +08:00
@@ -3,7 +3,7 @@
 #
 
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1, t2;
 --enable_warnings
 
 select CASE "b" when "a" then 1 when "b" then 2 END;