bzr commit into mysql-5.1 branch (sven.sandberg:3107) Bug#39934

[Sven Sandberg]

#At file:///home/sven/bzr/b39934-mats-slave_row_engine/5.1-rep%2B3/ based on revid:sven.sandberg@stripped

 3107 Sven Sandberg	2009-09-30
      post-merge fixes to make tests pass after merging BUG#39934 to 5.1-rep+3.

    modified:
      mysql-test/r/sp_trans.result
      mysql-test/t/sp_trans.test
=== modified file 'mysql-test/r/sp_trans.result'
--- a/mysql-test/r/sp_trans.result	2009-07-22 16:16:17 +0000
+++ b/mysql-test/r/sp_trans.result	2009-09-30 16:20:52 +0000
@@ -506,8 +506,6 @@ select count(*)*255 from t3 into table_s
 until table_size > max_table_size*2 end repeat;
 end|
 call bug14210_fill_table()|
-Warnings:
-Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason: Statement uses a system variable whose value may differ on slave.
 drop procedure bug14210_fill_table|
 create table t4 like t3|
 create procedure bug14210()

=== modified file 'mysql-test/t/sp_trans.test'
--- a/mysql-test/t/sp_trans.test	2007-06-15 16:56:11 +0000
+++ b/mysql-test/t/sp_trans.test	2009-09-30 16:20:52 +0000
@@ -527,7 +527,9 @@ begin
     select count(*)*255 from t3 into table_size;
   until table_size > max_table_size*2 end repeat;
 end|
+--disable_warnings
 call bug14210_fill_table()|
+--enable_warnings
 drop procedure bug14210_fill_table|
 create table t4 like t3|
 


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