bk commit into 5.1 tree (mats:1.2531) BUG#28722

[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-22 01:39:23+02:00, mats@stripped +9 -0
  BUG#28722 (Multi-engine statements on has_own_binlogging engine):
  Test fixes resulting from changed semantics.

  mysql-test/extra/rpl_tests/rpl_row_UUID.test@stripped, 2007-06-22 01:39:18+02:00,
mats@stripped +1 -1
    Using same engine throughout to prevent NDB tests from failing.

  mysql-test/r/binlog_multi_engine.result@stripped, 2007-06-22 01:39:18+02:00,
mats@stripped +3 -14
    Result change.

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-06-22 01:39:18+02:00,
mats@stripped +1 -1
    Result change.

  mysql-test/r/ndb_trigger.result@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +2 -2
    Result change.

  mysql-test/r/rpl_ndb_UUID.result@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +1 -1
    Result change.

  mysql-test/r/rpl_row_UUID.result@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +1 -1
    Result change.

  mysql-test/t/binlog_multi_engine.test@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +0 -1
    Removing garbage.

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +1 -1
    Using ndbcluster for table used inside trigger.

  mysql-test/t/ndb_trigger.test@stripped, 2007-06-22 01:39:19+02:00,
mats@stripped +2 -2
    Using ndbcluster for table used inside trigger.

# 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/b28722-mysql-5.1-rpl

--- 1.4/mysql-test/r/ndb_trigger.result	2007-06-22 01:39:31 +02:00
+++ 1.5/mysql-test/r/ndb_trigger.result	2007-06-22 01:39:31 +02:00
@@ -1,7 +1,7 @@
 drop table if exists t1, t2, t3, t4, t5;
 create table t1 (id int primary key, a int not null, b decimal (63,30) default 0)
engine=ndb;
-create table t2 (op char(1), a int not null, b decimal (63,30));
-create table t3 select 1 as i;
+create table t2 (op char(1), a int not null, b decimal (63,30)) engine=ndb;
+create table t3  engine=ndb select 1 as i;
 create table t4 (a int not null primary key, b int) engine=ndb;
 create table t5 (a int not null primary key, b int) engine=ndb;
 create trigger t1_bu before update on t1 for each row

--- 1.4/mysql-test/t/ndb_trigger.test	2007-06-22 01:39:31 +02:00
+++ 1.5/mysql-test/t/ndb_trigger.test	2007-06-22 01:39:31 +02:00
@@ -19,8 +19,8 @@
 --enable_warnings
 
 create table t1 (id int primary key, a int not null, b decimal (63,30) default 0)
engine=ndb;
-create table t2 (op char(1), a int not null, b decimal (63,30));
-create table t3 select 1 as i;
+create table t2 (op char(1), a int not null, b decimal (63,30)) engine=ndb;
+create table t3  engine=ndb select 1 as i;
 create table t4 (a int not null primary key, b int) engine=ndb;
 create table t5 (a int not null primary key, b int) engine=ndb;
 

--- 1.5/mysql-test/r/rpl_ndb_UUID.result	2007-06-22 01:39:31 +02:00
+++ 1.6/mysql-test/r/rpl_ndb_UUID.result	2007-06-22 01:39:31 +02:00
@@ -24,7 +24,7 @@
 select fn1(0);
 fn1(0)
 0
-create table t2 (a int);
+create table t2 (a int) engine=NDB;
 insert into t2 values(fn1(2));
 SHOW CREATE TABLE test.t1;
 Table	Create Table

--- 1.6/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2007-06-22 01:39:31 +02:00
+++ 1.7/mysql-test/extra/rpl_tests/rpl_row_UUID.test	2007-06-22 01:39:31 +02:00
@@ -41,7 +41,7 @@
 delimiter ;|
 # test both in SELECT and in INSERT
 select fn1(0);
-create table t2 (a int);
+eval create table t2 (a int) engine=$engine_type;
 insert into t2 values(fn1(2));
 
 sync_slave_with_master;

--- 1.4/mysql-test/r/rpl_row_UUID.result	2007-06-22 01:39:31 +02:00
+++ 1.5/mysql-test/r/rpl_row_UUID.result	2007-06-22 01:39:31 +02:00
@@ -24,7 +24,7 @@
 select fn1(0);
 fn1(0)
 0
-create table t2 (a int);
+create table t2 (a int) engine=myisam;
 insert into t2 values(fn1(2));
 SHOW CREATE TABLE test.t1;
 Table	Create Table

--- 1.6/mysql-test/r/binlog_multi_engine.result	2007-06-22 01:39:31 +02:00
+++ 1.7/mysql-test/r/binlog_multi_engine.result	2007-06-22 01:39:31 +02:00
@@ -11,7 +11,6 @@
 INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2);
 UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: Binary logging not possible. Message: Statement-based format required for
this statement, but not allowed by this combination of engines
 COMMIT;
 TRUNCATE t1m;
 TRUNCATE t1b;
@@ -49,18 +48,6 @@
 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: 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: 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;
-ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically
since more than one engine involved and at least one engine is self-logging
-UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: Binary logging not possible. Message: Row-based format required for this
statement, but not allowed by this combination of engines
-DROP TABLE t1m, t1b, t1n;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1m VALUES (1,1), (1,2), (2,1),
(2,2)
@@ -84,8 +71,10 @@
 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: 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;
+ERROR HY000: Binary logging not possible. Message: Statement cannot be written atomically
since more than one engine involved and at least one engine is self-logging
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
-ERROR HY000: Binary logging not possible. Message: Statement cannot be logged to the
binary log in row-based nor statement-based format
+ERROR HY000: Binary logging not possible. Message: Row-based format required for this
statement, but not allowed by this combination of engines
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)

--- 1.6/mysql-test/t/binlog_multi_engine.test	2007-06-22 01:39:31 +02:00
+++ 1.7/mysql-test/t/binlog_multi_engine.test	2007-06-22 01:39:31 +02:00
@@ -54,7 +54,6 @@
 
 #UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f;
 
->>>>>>>
 error ER_BINLOG_LOGGING_IMPOSSIBLE;
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 

--- 1.13/mysql-test/r/ndb_read_multi_range.result	2007-06-22 01:39:31 +02:00
+++ 1.14/mysql-test/r/ndb_read_multi_range.result	2007-06-22 01:39:31 +02:00
@@ -451,7 +451,7 @@
 var1 int(2) NOT NULL,
 var2 int(2) NOT NULL,
 PRIMARY KEY  (var1)
-) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;
+) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;
 CREATE TRIGGER testtrigger
 AFTER UPDATE ON t1 FOR EACH ROW BEGIN
 REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|

--- 1.16/mysql-test/t/ndb_read_multi_range.test	2007-06-22 01:39:31 +02:00
+++ 1.17/mysql-test/t/ndb_read_multi_range.test	2007-06-22 01:39:31 +02:00
@@ -286,7 +286,7 @@
        var1 int(2) NOT NULL,
        var2 int(2) NOT NULL,
        PRIMARY KEY  (var1)
-     ) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;
+     ) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;
 
 
 DELIMITER |;