bzr push into mysql-5.5 branch (rohit.kalhans:3557 to 3558) Bug#11758262 Bug#13043055

[Rohit Kalhans]

 3558 Rohit Kalhans	2011-09-30
      BUG#11758262 BUG#13043055
      
      Problem: commit_1innodb fails on pb2 after the patch for BUG#11758262
      Background: Certain statements threw warnings only in statement mode causing
      the result cintent mismatch.
      
      Fix: disabled warnings from the statements.

    modified:
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
 3557 Rafal Somla	2011-09-29
      Bug#12982926  CLIENT CAN OVERRIDE ZERO-LENGTH-ALLOCATE BUFFER
      
      Changes in client plugin needed for testing the issue (test instrumentation).

    modified:
      libmysql/authentication_win/handshake_client.cc
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2011-01-31 13:11:05 +0000
+++ b/mysql-test/include/commit.inc	2011-09-30 09:46:35 +0000
@@ -521,7 +521,9 @@ commit;
 call p_verify_status_increment(2, 2, 2, 2);
 --echo # 15. Read-write statement: UPDATE IGNORE, change 0 rows. 
 --echo #
+--disable_warnings
 update ignore t1 set a=2 where a=1;
+--enable_warnings
 call p_verify_status_increment(2, 2, 1, 0);
 commit;
 call p_verify_status_increment(2, 2, 1, 0);
@@ -603,7 +605,9 @@ call p_verify_status_increment(2, 0, 1,
 
 --echo # 21. Read-write statement: UPDATE, change 0 (transactional) rows. 
 --echo #
+--disable_warnings
 update t1 set a=2 where a=f1()+10;
+--enable_warnings
 call p_verify_status_increment(2, 0, 1, 0);
 commit;
 call p_verify_status_increment(2, 0, 1, 0);
@@ -703,7 +707,9 @@ call p_verify_status_increment(4, 4, 4,
 --echo # 
 insert into t2 select a from t1;
 commit;
+--disable_warnings
 replace into t2 select a from t1;
+--enable_warnings
 commit;
 call p_verify_status_increment(8, 8, 8, 8);
 #

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2011-09-29 09:17:27 +0000
+++ b/mysql-test/r/commit_1innodb.result	2011-09-30 09:46:35 +0000
@@ -549,8 +549,6 @@ SUCCESS
 # 15. Read-write statement: UPDATE IGNORE, change 0 rows. 
 #
 update ignore t1 set a=2 where a=1;
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave.
 call p_verify_status_increment(2, 2, 1, 0);
 SUCCESS
 
@@ -816,8 +814,6 @@ SUCCESS
 insert into t2 select a from t1;
 commit;
 replace into t2 select a from t1;
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave.
 commit;
 call p_verify_status_increment(8, 8, 8, 8);
 SUCCESS

No bundle (reason: useless for push emails).