List:Commits« Previous MessageNext Message »
From:Rohit Kalhans Date:February 7 2012 8:59pm
Subject:bzr push into mysql-trunk branch (rohit.kalhans:3853 to 3854) Bug#11758263
View as plain text  
 3854 Rohit Kalhans	2012-02-08
      follow-up patch for the last push for BUG#11758263

    modified:
      mysql-test/r/ps.result
      mysql-test/t/ps.test
 3853 Rohit Kalhans	2012-02-08 [merge]
      merge from mysql-5.5 to trunk after the patch for bug#11758263.

    modified:
      mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
      mysql-test/extra/rpl_tests/rpl_multi_update.test
      mysql-test/extra/rpl_tests/rpl_multi_update2.test
      mysql-test/extra/rpl_tests/rpl_multi_update3.test
      mysql-test/r/ps.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
      mysql-test/suite/rpl/r/rpl_insert_id_pk.result
      mysql-test/suite/rpl/r/rpl_multi_update.result
      mysql-test/suite/rpl/r/rpl_multi_update2.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
      mysql-test/suite/rpl/t/rpl_multi_update2.test
      mysql-test/suite/rpl/t/rpl_multi_update3.test
      mysql-test/suite/rpl/t/rpl_optimize.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_semi_sync_event.test
      mysql-test/suite/rpl/t/rpl_timezone.test
      mysql-test/t/multi_update.test
      mysql-test/t/ps.test
      sql/share/errmsg-utf8.txt
      sql/sql_base.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2012-02-07 19:06:57 +0000
+++ b/mysql-test/r/ps.result	2012-02-07 20:58:20 +0000
@@ -231,12 +231,8 @@ execute stmt1;
 execute stmt1;
 prepare stmt1 from "create table t1 select 1 as i";
 execute stmt1;
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave.
 drop table t1;
 execute stmt1;
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave.
 prepare stmt1 from "insert into t1 select i from t1";
 execute stmt1;
 execute stmt1;
@@ -1718,8 +1714,6 @@ drop tables t1;
 prepare stmt from "create table t1 select ?";
 set @a=1.0;
 execute stmt using @a;
-Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/t/ps.test'
--- a/mysql-test/t/ps.test	2012-02-07 19:06:57 +0000
+++ b/mysql-test/t/ps.test	2012-02-07 20:58:20 +0000
@@ -239,8 +239,10 @@ prepare stmt1 from "select 1 into @var";
 execute stmt1;
 execute stmt1;
 prepare stmt1 from "create table t1 select 1 as i";
+--disable_warnings ONCE
 execute stmt1;
 drop table t1;
+--disable_warnings ONCE
 execute stmt1;
 prepare stmt1 from "insert into t1 select i from t1";
 execute stmt1;
@@ -1819,6 +1821,7 @@ drop tables t1;
 #
 prepare stmt from "create table t1 select ?";
 set @a=1.0;
+--disable_warnings ONCE
 execute stmt using @a;
 show create table t1;
 drop table t1;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (rohit.kalhans:3853 to 3854) Bug#11758263Rohit Kalhans8 Feb