bzr commit into mysql-5.1 branch (Li-Bing.Song:3084) Bug#46010

[Li-Bing.Song]

#At file:///home/anders/work/bzrwork/bug46010/mysql-5.1-bugteam/ based on revid:joro@stripped

 3084 Li-Bing.Song@stripped	2009-09-02
      Bug#46010  main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
      
      This test case uses mysqlbinlog to dump the content of master-bin.000001,
      but the content of master-bin.000001 is not that this test needs.
      
      MTR runs a lot of test cases on one server, so the postion of this test's binlog
      is not sure if some tests has wrote binlog before it.
      So 'RESET MASTER' comand must be called at the begin, it ensures that binlog of this test
      is wrote to master-bin.000001 correctly.  
      
      Three other tests have the same problem, They were fixed together.
      mysqlbinlog-cp932
      binlog_incident
      binlog_tmp_table

    modified:
      mysql-test/r/ctype_gbk_binlog.result
      mysql-test/r/mysqlbinlog-cp932.result
      mysql-test/suite/binlog/r/binlog_incident.result
      mysql-test/suite/binlog/r/binlog_tmp_table.result
      mysql-test/suite/binlog/t/binlog_incident.test
      mysql-test/suite/binlog/t/binlog_tmp_table.test
      mysql-test/t/ctype_gbk_binlog.test
      mysql-test/t/mysqlbinlog-cp932.test
=== modified file 'mysql-test/r/ctype_gbk_binlog.result'
--- a/mysql-test/r/ctype_gbk_binlog.result	2009-07-07 14:18:44 +0000
+++ b/mysql-test/r/ctype_gbk_binlog.result	2009-09-02 11:08:03 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 SET NAMES gbk;
 CREATE TABLE t1 (
 f1 BLOB

=== modified file 'mysql-test/r/mysqlbinlog-cp932.result'
--- a/mysql-test/r/mysqlbinlog-cp932.result	2007-02-19 10:57:06 +0000
+++ b/mysql-test/r/mysqlbinlog-cp932.result	2009-09-02 11:08:03 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932);

=== modified file 'mysql-test/suite/binlog/r/binlog_incident.result'
--- a/mysql-test/suite/binlog/r/binlog_incident.result	2009-05-11 11:32:38 +0000
+++ b/mysql-test/suite/binlog/r/binlog_incident.result	2009-09-02 11:08:03 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2),(3);
 SELECT * FROM t1;

=== modified file 'mysql-test/suite/binlog/r/binlog_tmp_table.result'
--- a/mysql-test/suite/binlog/r/binlog_tmp_table.result	2009-01-28 14:35:12 +0000
+++ b/mysql-test/suite/binlog/r/binlog_tmp_table.result	2009-09-02 11:08:03 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 create table foo (a int);
 flush logs;
 create temporary table tmp1_foo like foo;

=== modified file 'mysql-test/suite/binlog/t/binlog_incident.test'
--- a/mysql-test/suite/binlog/t/binlog_incident.test	2009-05-11 11:32:38 +0000
+++ b/mysql-test/suite/binlog/t/binlog_incident.test	2009-09-02 11:08:03 +0000
@@ -6,6 +6,7 @@ source include/have_log_bin.inc;
 source include/have_debug.inc;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
+RESET MASTER;
 
 CREATE TABLE t1 (a INT);
 
@@ -24,4 +25,4 @@ exec $MYSQL_BINLOG --start-position=106 
 eval SELECT cont LIKE '%RELOAD DATABASE; # Shall generate syntax error%' AS `Contain RELOAD DATABASE` FROM (SELECT load_file('$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql') AS cont) AS tbl;
 --enable_query_log
 
-remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;
\ No newline at end of file
+remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;

=== modified file 'mysql-test/suite/binlog/t/binlog_tmp_table.test'
--- a/mysql-test/suite/binlog/t/binlog_tmp_table.test	2009-01-31 21:47:50 +0000
+++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test	2009-09-02 11:08:03 +0000
@@ -30,6 +30,7 @@ source include/have_binlog_format_mixed_
 
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+RESET MASTER;
 
 create table foo (a int);
 

=== modified file 'mysql-test/t/ctype_gbk_binlog.test'
--- a/mysql-test/t/ctype_gbk_binlog.test	2009-07-07 14:18:44 +0000
+++ b/mysql-test/t/ctype_gbk_binlog.test	2009-09-02 11:08:03 +0000
@@ -1,6 +1,6 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/have_gbk.inc
-
+RESET MASTER;
 SET NAMES gbk;
 --character_set gbk
 

=== modified file 'mysql-test/t/mysqlbinlog-cp932.test'
--- a/mysql-test/t/mysqlbinlog-cp932.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/t/mysqlbinlog-cp932.test	2009-09-02 11:08:03 +0000
@@ -5,6 +5,8 @@
 -- source include/have_cp932.inc
 -- source include/have_log_bin.inc
 
+RESET MASTER;
+
 # Bug#16217 (mysql client did not know how not switch its internal charset)
 flush logs;
 create table t3 (f text character set utf8);


Attachment: [text/bzr-bundle] bzr/[e-mail]