bk commit into 5.1 tree (tomas:1.1974)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1974 05/11/24 09:51:12 tomas@stripped +3 -0
  modified tests to use order by
  + added missing drop table

  mysql-test/r/rpl_row_basic_3innodb.result
    1.4 05/11/24 09:51:05 tomas@stripped +10 -12
    modified tests to use order by
    + added missing drop table

  mysql-test/r/rpl_row_basic_2myisam.result
    1.4 05/11/24 09:51:05 tomas@stripped +12 -14
    modified tests to use order by
    + added missing drop table

  mysql-test/include/rpl_row_basic.inc
    1.5 05/11/24 09:51:05 tomas@stripped +12 -12
    modified tests to use order by
    + added missing drop table

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl1012-v3

--- 1.3/mysql-test/r/rpl_row_basic_2myisam.result	2005-09-30 15:54:13 +02:00
+++ 1.4/mysql-test/r/rpl_row_basic_2myisam.result	2005-11-24 09:51:05 +01:00
@@ -356,17 +356,17 @@
 X	Q	5	9	R	81	X	Z	2	S	2
 CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2
CHAR(1) NOT NULL DEFAULT 'A') ENGINE = 'MYISAM'  ;
 INSERT INTO t4 SET C1 = 1;
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
 CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'MYISAM'  ;
 
 --- on slave: original values ---
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	3
 2	6
@@ -374,14 +374,14 @@
 
 --- on master: new values inserted ---
 INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	2
 2	4
 3	6
 
 --- on slave: old values should be overwritten by replicated values ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	2
 2	4
@@ -397,32 +397,30 @@
 ERROR 23000: Duplicate entry '99' for key 2
 INSERT INTO t7 VALUES (11,22,99);
 ERROR 23000: Duplicate entry '99' for key 3
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 99	99	99
 
 --- on slave ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 99	99	99
 INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
-99	99	99
 1	2	3
 2	4	6
 3	6	9
+99	99	99
 
 --- on master ---
 INSERT INTO t7 VALUES (2,4,8);
 
 --- on slave ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
-99	99	99
 1	2	3
 2	4	8
 3	6	9
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
-Warnings:
-Note	1051	Unknown table 't8'
+99	99	99
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;

--- 1.3/mysql-test/r/rpl_row_basic_3innodb.result	2005-09-30 15:54:13 +02:00
+++ 1.4/mysql-test/r/rpl_row_basic_3innodb.result	2005-11-24 09:51:05 +01:00
@@ -356,17 +356,17 @@
 X	Q	5	9	R	81	X	Z	2	S	2
 CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2
CHAR(1) NOT NULL DEFAULT 'A') ENGINE = 'INNODB'  ;
 INSERT INTO t4 SET C1 = 1;
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 C1	HEX(B1)	HEX(B2)
 1	NULL	0
 CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'INNODB'  ;
 
 --- on slave: original values ---
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	3
 2	6
@@ -374,14 +374,14 @@
 
 --- on master: new values inserted ---
 INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	2
 2	4
 3	6
 
 --- on slave: old values should be overwritten by replicated values ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 C1	C2
 1	2
 2	4
@@ -397,16 +397,16 @@
 ERROR 23000: Duplicate entry '99' for key 2
 INSERT INTO t7 VALUES (11,22,99);
 ERROR 23000: Duplicate entry '99' for key 3
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 99	99	99
 
 --- on slave ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 99	99	99
 INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 1	2	3
 2	4	6
@@ -417,12 +417,10 @@
 INSERT INTO t7 VALUES (2,4,8);
 
 --- on slave ---
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 a	b	c
 1	2	3
 2	4	8
 3	6	9
 99	99	99
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
-Warnings:
-Note	1051	Unknown table 't8'
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;

--- 1.4/mysql-test/include/rpl_row_basic.inc	2005-09-30 15:54:13 +02:00
+++ 1.5/mysql-test/include/rpl_row_basic.inc	2005-11-24 09:51:05 +01:00
@@ -10,7 +10,7 @@
 # First we test tables with only an index.
 #
 
-eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index) ENGINE = $type ;
+eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
 SELECT * FROM t1;
 sync_slave_with_master;
 SELECT * FROM t1;
@@ -116,7 +116,7 @@
 # Testing table without index or primary key
 #
 connection master;
-eval CREATE TABLE t6 (C1 CHAR(1), C2 CHAR(1), C3 INT) ENGINE = $type;
+eval CREATE TABLE t6 (C1 CHAR(1), C2 CHAR(1), C3 INT$extra_index_t6) ENGINE = $type;
 
 # Testing insert
 INSERT INTO t6 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
@@ -164,9 +164,9 @@
 eval CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2
CHAR(1) NOT NULL DEFAULT 'A') ENGINE = $type ;
 
 INSERT INTO t4 SET C1 = 1;
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 sync_slave_with_master;
-SELECT C1,HEX(B1),HEX(B2) FROM t4;
+SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 
 #
 # Testing conflicting operations
@@ -178,19 +178,19 @@
 SELECT "--- on slave: original values ---" AS "";
 --enable_query_log
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 
 connection master;
 --disable_query_log
 SELECT "--- on master: new values inserted ---" AS "";
 --enable_query_log
 INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 sync_slave_with_master;
 --disable_query_log
 SELECT "--- on slave: old values should be overwritten by replicated values ---" AS "";
 --enable_query_log
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY C1;
 
 #
 # A more complicated test where the table has several keys and we are
@@ -211,15 +211,15 @@
 INSERT INTO t7 VALUES (11,99,33);
 --error 1062
 INSERT INTO t7 VALUES (11,22,99);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 
 sync_slave_with_master;
 --disable_query_log
 SELECT "--- on slave ---" AS "";
 --enable_query_log
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 
 connection master;
 --disable_query_log
@@ -232,7 +232,7 @@
 --disable_query_log
 SELECT "--- on slave ---" AS "";
 --enable_query_log
-SELECT * FROM t7;
+SELECT * FROM t7 ORDER BY a;
 
 #
 # Test conflicting operations when changing in a table referenced by a
@@ -245,5 +245,5 @@
 #
 
 connection master;
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 sync_slave_with_master;