bzr commit into mysql-5.0-bugteam branch (alfranio.correia:2721) Bug#46861

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-46861/b46861-5.0.72sp-postfix/ based on revid:alfranio.correia@stripped

 2721 Alfranio Correia	2009-08-28
      Post-fix for BUG#46861.

    modified:
      mysql-test/r/rpl_rewrite_db.result
      mysql-test/t/rpl_rewrite_db.test
=== modified file 'mysql-test/r/rpl_rewrite_db.result'
--- a/mysql-test/r/rpl_rewrite_db.result	2009-08-26 14:50:30 +0000
+++ b/mysql-test/r/rpl_rewrite_db.result	2009-08-28 10:59:40 +0000
@@ -90,7 +90,12 @@ a	b
 2	row 2
 3	row 3
 0	
+set sql_log_bin= 0;
 drop database rewrite;
+set sql_log_bin= 1;
+set sql_log_bin= 0;
+drop table t1;
+set sql_log_bin= 1;
 
 ****
 **** Bug #46861 Auto-closing of temporary tables broken by replicate-rewrite-db
@@ -189,6 +194,7 @@ get_lock("con_03",10)
 1
 
 **** Checking the binary log and temporary tables
+
 show status like 'Slave_open_temp_tables';
 Variable_name	Value
 Slave_open_temp_tables	0

=== modified file 'mysql-test/t/rpl_rewrite_db.test'
--- a/mysql-test/t/rpl_rewrite_db.test	2009-08-26 14:50:30 +0000
+++ b/mysql-test/t/rpl_rewrite_db.test	2009-08-28 10:59:40 +0000
@@ -73,7 +73,14 @@ connection slave;
 # The empty line last comes from the end line field in the file
 select * from rewrite.t1;
 
+set sql_log_bin= 0;
 drop database rewrite;
+set sql_log_bin= 1;
+
+connection master;
+set sql_log_bin= 0;
+drop table t1;
+set sql_log_bin= 1;
 
 # End of 4.1 tests
 
@@ -197,7 +204,7 @@ select get_lock("con_03",10);
 
 --echo
 --echo **** Checking the binary log and temporary tables
---ehco
+--echo
 connection master;
 sync_slave_with_master;
 connection slave;


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