MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:February 15 2006 4:19pm
Subject:bk commit into 5.1 tree (msvensson:1.2109) BUG#17386
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2109 06/02/15 17:19:40 msvensson@stripped +2 -0
  Bug#17386 binlog interchangably contains engine= and type=
   - Update result file and enable test

  mysql-test/t/disabled.def
    1.70 06/02/15 17:19:36 msvensson@stripped +0 -1
    Enable test

  mysql-test/r/binlog_row_mix_innodb_myisam.result
    1.3 06/02/15 17:19:36 msvensson@stripped +14 -14
    Update resultfile, when switching from type to engine, the log position needs to be increased by two after that statement.

# 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:	msvensson
# Host:	devsrv-b.mysql.com
# Root:	/space/magnus/my51-bug17386

--- 1.69/mysql-test/t/disabled.def	2006-02-15 14:12:28 +01:00
+++ 1.70/mysql-test/t/disabled.def	2006-02-15 17:19:36 +01:00
@@ -33,7 +33,6 @@
 sp-goto              : GOTO is currently is disabled - will be fixed in the future
 subselect            : Bug#15706 (ps mode) [PATCH PENDING]
 rpl_ndb_log          : result not deterministic
-binlog_row_mix_innodb_myisam : Bug #17386
 binlog_row_insert_select : Bug #17385
 rpl_row_basic_2myisam : Bug #17385
 rpl_row_basic_3innodb : Bug #17385

--- 1.2/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-01-05 10:52:47 +01:00
+++ 1.3/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-02-15 17:19:36 +01:00
@@ -210,7 +210,7 @@
 master-bin.000001	316	Xid	1	#	COMMIT /* xid= */
 delete from t1;
 delete from t2;
-alter table t2 type=MyISAM;
+alter table t2 engine=MyISAM;
 insert into t1 values (1);
 begin;
 select * from t1 for update;
@@ -266,18 +266,18 @@
 master-bin.000001	420	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	447	Query	1	#	use `test`; delete from t2
 master-bin.000001	524	Xid	1	#	COMMIT /* xid= */
-master-bin.000001	551	Query	1	#	use `test`; alter table t2 type=MyISAM
-master-bin.000001	640	Table_map	1	#	test.t1
-master-bin.000001	679	Write_rows	1	#	
-master-bin.000001	713	Xid	1	#	COMMIT /* xid= */
-master-bin.000001	740	Table_map	1	#	test.t2
-master-bin.000001	779	Write_rows	1	#	
-master-bin.000001	813	Query	1	#	use `test`; drop table t1,t2
-master-bin.000001	892	Query	1	#	use `test`; create table t0 (n int)
-master-bin.000001	978	Table_map	1	#	test.t0
-master-bin.000001	1017	Write_rows	1	#	
-master-bin.000001	1051	Table_map	1	#	test.t0
-master-bin.000001	1090	Write_rows	1	#	
-master-bin.000001	1124	Query	1	#	use `test`; create table t2 (n int) engine=innodb
+master-bin.000001	551	Query	1	#	use `test`; alter table t2 engine=MyISAM
+master-bin.000001	642	Table_map	1	#	test.t1
+master-bin.000001	681	Write_rows	1	#	
+master-bin.000001	715	Xid	1	#	COMMIT /* xid= */
+master-bin.000001	742	Table_map	1	#	test.t2
+master-bin.000001	781	Write_rows	1	#	
+master-bin.000001	815	Query	1	#	use `test`; drop table t1,t2
+master-bin.000001	894	Query	1	#	use `test`; create table t0 (n int)
+master-bin.000001	980	Table_map	1	#	test.t0
+master-bin.000001	1019	Write_rows	1	#	
+master-bin.000001	1053	Table_map	1	#	test.t0
+master-bin.000001	1092	Write_rows	1	#	
+master-bin.000001	1126	Query	1	#	use `test`; create table t2 (n int) engine=innodb
 do release_lock("lock1");
 drop table t0,t2;
Thread
bk commit into 5.1 tree (msvensson:1.2109) BUG#17386msvensson15 Feb