bk commit into 5.1 tree (mats:1.2553) BUG#23051

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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, 2007-06-13 12:28:35+02:00, mats@stripped +7 -0
  BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
  
  Post-merge fixes.

  BitKeeper/deleted/.del-ndb_binlog_basic2.result@stripped, 2007-06-13 08:55:15+02:00,
mats@stripped +0 -0
    Delete: mysql-test/r/ndb_binlog_basic2.result

  BitKeeper/deleted/.del-ndb_binlog_basic2.test@stripped, 2007-06-13 08:55:09+02:00,
mats@stripped +0 -0
    Delete: mysql-test/t/ndb_binlog_basic2.test

  mysql-test/r/binlog_innodb.result@stripped, 2007-06-13 12:28:28+02:00,
mats@stripped +2 -2
    Result change

  mysql-test/r/binlog_multi_engine.result@stripped, 2007-06-13 12:28:28+02:00,
mats@stripped +10 -9
    Result change

  mysql-test/t/binlog_multi_engine.test@stripped, 2007-06-13 12:28:28+02:00,
mats@stripped +7 -7
    Changed error code

  mysql-test/t/partition_hash.test@stripped, 2007-06-13 12:28:28+02:00,
mats@stripped +1 -1
    Changed error code

  sql/sql_class.h@stripped, 2007-06-13 12:28:28+02:00, mats@stripped +4 -3
    Fixes to select_create constructor argument list.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/b23051-mysql-5.1-rpl

--- 1.368/sql/sql_class.h	2007-06-13 12:28:45 +02:00
+++ 1.369/sql/sql_class.h	2007-06-13 12:28:45 +02:00
@@ -1998,13 +1998,14 @@
 public:
   select_create (TABLE_LIST *table_arg,
 		 HA_CREATE_INFO *create_info_par,
-		 List<create_field> &fields_par,
-		 List<Key> &keys_par,
+                 Alter_info *alter_info_arg,
 		 List<Item> &select_fields,enum_duplicates duplic, bool ignore,
                  TABLE_LIST *select_tables_arg)
     :select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore),
     create_table(table_arg),
-    create_info(create_info_par), select_tables(select_tables_arg)
+    create_info(create_info_par),
+    select_tables(select_tables_arg),
+    alter_info(alter_info_arg)
     {}
   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
 

--- 1.1/mysql-test/r/binlog_innodb.result	2007-06-13 12:28:45 +02:00
+++ 1.2/mysql-test/r/binlog_innodb.result	2007-06-13 12:28:45 +02:00
@@ -14,12 +14,12 @@
 BEGIN;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 UPDATE t1 SET b = 1*a WHERE a > 1;
-ERROR HY000: Logging not possible. Message: InnoDB: Transaction level 'READ-UNCOMMITTED'
is not safe for binlog mode 'STATEMENT'
+ERROR HY000: Binary logging not possible. Message: Transaction level 'READ-UNCOMMITTED'
in InnoDB is not safe for binlog mode 'STATEMENT'
 COMMIT;
 BEGIN;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 UPDATE t1 SET b = 2*a WHERE a > 2;
-ERROR HY000: Logging not possible. Message: InnoDB: Transaction level 'READ-COMMITTED' is
not safe for binlog mode 'STATEMENT'
+ERROR HY000: Binary logging not possible. Message: Transaction level 'READ-COMMITTED' in
InnoDB is not safe for binlog mode 'STATEMENT'
 COMMIT;
 BEGIN;
 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;

--- 1.1/mysql-test/r/binlog_multi_engine.result	2007-06-13 12:28:45 +02:00
+++ 1.2/mysql-test/r/binlog_multi_engine.result	2007-06-13 12:28:45 +02:00
@@ -5,12 +5,12 @@
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
-ERROR HY000: Attempting to log statement in in statement format, but statement format is
not possible with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Statement-based format required for
this statement, but not allowed by this combination of engines
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
-ERROR HY000: Attempting to log statement in in statement format, but statement format is
not possible with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Statement-based format required for
this statement, but not allowed by this combination of engines
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: It is not possible to log anything with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Statement cannot be logged to the
binary log in row-based nor statement-based format
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
@@ -21,20 +21,20 @@
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: It is not possible to log anything with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Statement cannot be logged to the
binary log in row-based nor statement-based format
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
 SET SESSION BINLOG_FORMAT=ROW;
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
-ERROR HY000: Attempting to log statement in in row format, but row format is not possible
with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Row-based format required for this
statement, but not allowed by this combination of engines
 INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
-ERROR HY000: Attempting to log statement in in row format, but row format is not possible
with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Row-based format required for this
statement, but not allowed by this combination of engines
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: It is not possible to log anything with this combination of engines
+ERROR HY000: Binary logging not possible. Message: Statement cannot be logged to the
binary log in row-based nor statement-based format
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
@@ -51,9 +51,10 @@
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1),
(2,2)
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1),
(2,2)
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1),
(2,2)
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
-master-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)
+master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1m
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
 master-bin.000001	#	Query	#	#	BEGIN

--- 1.1/mysql-test/t/binlog_multi_engine.test	2007-06-13 12:28:45 +02:00
+++ 1.2/mysql-test/t/binlog_multi_engine.test	2007-06-13 12:28:45 +02:00
@@ -9,13 +9,13 @@
 
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
-error ER_BINLOG_STMT_FORMAT_FORBIDDEN;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
-error ER_BINLOG_STMT_FORMAT_FORBIDDEN;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
-error ER_BINLOG_ENGINES_INCOMPATIBLE;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 
 TRUNCATE t1m;
@@ -30,7 +30,7 @@
 
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
-error ER_BINLOG_ENGINES_INCOMPATIBLE;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 
 TRUNCATE t1m;
@@ -40,14 +40,14 @@
 SET SESSION BINLOG_FORMAT=ROW;
 
 INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
-error ER_BINLOG_ROW_FORMAT_FORBIDDEN;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
 INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 
-error ER_BINLOG_ROW_FORMAT_FORBIDDEN;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
-error ER_BINLOG_ENGINES_INCOMPATIBLE;
+error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 
 TRUNCATE t1m;

--- 1.8/mysql-test/t/partition_hash.test	2007-06-13 12:28:45 +02:00
+++ 1.9/mysql-test/t/partition_hash.test	2007-06-13 12:28:45 +02:00
@@ -134,7 +134,7 @@
 --disable_warnings
 CREATE TABLE t1 (s1 int) ENGINE=BLACKHOLE PARTITION BY HASH (s1);
 --enable_warnings
---error 0,ER_BINLOG_ROW_FORMAT_FORBIDDEN
+--error 0,ER_BINLOG_LOGGING_IMPOSSIBLE
 INSERT INTO t1 VALUES (0);
 DROP TABLE t1;