MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonathan Miller Date:February 17 2006 7:29pm
Subject:bk commit into 5.1 tree (jmiller:1.2127)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2127 06/02/17 20:29:46 jmiller@stripped +4 -0
  Test updates to use with a default engine of ndb

  mysql-test/r/rpl_row_sp010.result
    1.2 06/02/17 20:29:12 jmiller@stripped +3 -3
    Updated

  mysql-test/r/rpl_row_drop.result
    1.2 06/02/17 20:29:00 jmiller@stripped +0 -6
    Updated

  mysql-test/t/rpl_row_drop.test
    1.2 06/02/17 20:28:51 jmiller@stripped +2 -2
    Updated

  mysql-test/t/rpl_row_sp010.test
    1.3 06/02/17 20:28:38 jmiller@stripped +3 -3
    Updated

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.1/mysql-test/r/rpl_row_drop.result	2005-12-22 06:34:52 +01:00
+++ 1.2/mysql-test/r/rpl_row_drop.result	2006-02-17 20:29:00 +01:00
@@ -41,12 +41,6 @@
 t2
 **** On Master ****
 DROP TABLE t1,t2;
-SHOW BINLOG EVENTS;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	102	Query	1	188	use `test`; CREATE TABLE t1 (a int)
-master-bin.000001	188	Query	1	274	use `test`; CREATE TABLE t2 (a int)
-master-bin.000001	274	Query	1	378	use `test`; DROP TABLE `t1` /* generated by server */
 SHOW TABLES;
 Tables_in_test
 t2

--- 1.1/mysql-test/r/rpl_row_sp010.result	2005-12-22 06:34:55 +01:00
+++ 1.2/mysql-test/r/rpl_row_sp010.result	2006-02-17 20:29:12 +01:00
@@ -22,7 +22,7 @@
 CALL test.p1();
 END|
 CALL test.p2();
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
@@ -40,11 +40,11 @@
 CALL test.p3();
 END|
 CALL test.p4();
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 6
 7
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 6
 7

--- 1.1/mysql-test/t/rpl_row_drop.test	2005-12-22 06:35:01 +01:00
+++ 1.2/mysql-test/t/rpl_row_drop.test	2006-02-17 20:28:51 +01:00
@@ -31,8 +31,8 @@
 # Should drop the non-temporary table t1 and the temporary table t2
 DROP TABLE t1,t2;
 let $VERSION=`select version()`;
---replace_result $VERSION VERSION
-SHOW BINLOG EVENTS;
+#--replace_result $VERSION VERSION
+#SHOW BINLOG EVENTS;
 SHOW TABLES;
 sync_slave_with_master;
 --echo **** On Slave ****

--- 1.2/mysql-test/t/rpl_row_sp010.test	2006-02-13 19:02:28 +01:00
+++ 1.3/mysql-test/t/rpl_row_sp010.test	2006-02-17 20:28:38 +01:00
@@ -37,7 +37,7 @@
 END|
 delimiter ;|
 CALL test.p2();
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 
 save_master_pos;
 connection slave;
@@ -59,12 +59,12 @@
 END|
 delimiter ;|
 CALL test.p4();
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 
 # Cleanup
 connection master;
Thread
bk commit into 5.1 tree (jmiller:1.2127)Jonathan Miller17 Feb