bk commit into 5.1 tree (svoj:1.2571) BUG#34768

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj.  When svoj 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-03-25 17:28:12+04:00, svoj@stripped +4 -0
  BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode
              if binlog_format=mixed
  
  Addition to fix for BUG#34768: fixed test case failures discovered
  by pushbuild.

  mysql-test/suite/binlog/r/binlog_stm_ps.result@stripped, 2008-03-25 17:28:10+04:00, svoj@stripped +3 -2
    Fixed binlog_stm_ps failure when binlog format is statement:
    - this test case makes sence only if binlog format is statement,
      thus execute it only in this mode;
    - added a warning that insert ... select ... limit is not safe
      to execute in statement mode.

  mysql-test/suite/binlog/t/binlog_stm_ps.test@stripped, 2008-03-25 17:28:10+04:00, svoj@stripped +1 -1
    Fixed binlog_stm_ps failure when binlog format is statement:
    - this test case makes sence only if binlog format is statement,
      thus execute it only in this mode;
    - added a warning that insert ... select ... limit is not safe
      to execute in statement mode.

  mysql-test/suite/rpl/t/rpl_optimize.test@stripped, 2008-03-25 17:28:10+04:00, svoj@stripped +2 -0
    rpl_optimize test may be executed in various binlog format modes.
    In statement mode delete ... limit issues a warning, in mixed and
    row modes it does not.
    
    Fixed a test case so it is still possible to execute it in all binlog
    format modes by ignoring delete ... limit warnings.

  mysql-test/suite/rpl/t/rpl_user_variables.test@stripped, 2008-03-25 17:28:10+04:00, svoj@stripped +2 -0
    rpl_user_variables test may be executed in various binlog format modes.
    In statement mode insert ... select ... limit issues a warning,
    in mixed and row modes it does not.
    
    Fixed a test case so it is still possible to execute it in all binlog
    format modes by ignoring insert ... select ... limit warnings.

diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_ps.result b/mysql-test/suite/binlog/r/binlog_stm_ps.result
--- a/mysql-test/suite/binlog/r/binlog_stm_ps.result	2008-03-18 20:25:32 +04:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_ps.result	2008-03-25 17:28:10 +04:00
@@ -10,12 +10,13 @@ execute s using @a;
 prepare s from "insert into t1 select 100 limit ?";
 set @a=100;
 execute s using @a;
+Warnings:
+Warning	1592	Statement is not safe to log in statement format.
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	User var	#	#	@`a`=98
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (@a),(98)
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (99)
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 select 100 limit 100
 drop table t1;
diff -Nrup a/mysql-test/suite/binlog/t/binlog_stm_ps.test b/mysql-test/suite/binlog/t/binlog_stm_ps.test
--- a/mysql-test/suite/binlog/t/binlog_stm_ps.test	2007-06-27 17:27:31 +05:00
+++ b/mysql-test/suite/binlog/t/binlog_stm_ps.test	2008-03-25 17:28:10 +04:00
@@ -1,7 +1,7 @@
 # This test is to verify replication with PS
 
 -- source include/not_embedded.inc
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_statement.inc
 
 -- disable_query_log
 reset master; # get rid of previous tests binlog
diff -Nrup a/mysql-test/suite/rpl/t/rpl_optimize.test b/mysql-test/suite/rpl/t/rpl_optimize.test
--- a/mysql-test/suite/rpl/t/rpl_optimize.test	2007-06-27 17:27:31 +05:00
+++ b/mysql-test/suite/rpl/t/rpl_optimize.test	2008-03-25 17:28:10 +04:00
@@ -31,7 +31,9 @@ INSERT INTO t1 (a) SELECT null FROM t1;
 save_master_pos;
 # a few updates to force OPTIMIZE to do something
 update t1 set b=(a/2*rand());
+--disable_warnings
 delete from t1 order by b limit 10000;
+--enable_warnings
 
 connection slave;
 sync_with_master;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_user_variables.test b/mysql-test/suite/rpl/t/rpl_user_variables.test
--- a/mysql-test/suite/rpl/t/rpl_user_variables.test	2008-02-29 03:22:48 +04:00
+++ b/mysql-test/suite/rpl/t/rpl_user_variables.test	2008-03-25 17:28:10 +04:00
@@ -315,7 +315,9 @@ create table t1(a int);
 insert into t1 values (1),(2);
 prepare s1 from 'insert into t1 select a from t1 limit ?';
 set @x='1.1';
+--disable_warnings
 execute s1 using @x;
+--enable_warnings
 select * from t1;
 sync_slave_with_master;
 connection slave;