MySQL Lists: commits: bk commit into 5.1 tree (frazer:1.2744)

List:	Commits	« Previous Message Next Message »
From:	Frazer Clement	Date:	November 21 2007 3:12am
Subject:	bk commit into 5.1 tree (frazer:1.2744)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of frazer. When frazer 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-11-21 02:11:36+00:00, frazer@stripped +2 -0
  Bug 30674 : Re-add fixed test results after merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@stripped, 2007-11-21 02:11:27+00:00,
frazer@stripped +1445 -1442
    Re-add fixed test results after merge

  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@stripped, 2007-11-21 02:11:28+00:00,
frazer@stripped +1445 -1442
    Re-add fixed test results after merge

diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2007-11-21 01:26:01 +00:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2007-11-21 02:11:27 +00:00
@@ -1096,18 +1096,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 set c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -2243,18 +2244,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -3390,18 +3392,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2007-11-21 01:26:02 +00:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2007-11-21 02:11:28 +00:00
@@ -1096,18 +1096,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -2243,18 +2244,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
 
 
@@ -3390,18 +3392,19 @@ c1	hex(c4)	c5
 3	62316231623162316231623162316231	QA
 
 ** update from master **
+UPDATE t18 SET c5='TEST' WHERE c6=3;
 SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5	c6	c7
 1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
 2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
+3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
 
 ** Check slave **
 SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
 c1	hex(c4)	c5
 1	62316231623162316231623162316231	Kyle
 2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
+3	62316231623162316231623162316231	TEST
 DROP TABLE t18;
Thread
• bk commit into 5.1 tree (frazer:1.2744)	Frazer Clement	21 Nov