bzr push into mysql-trunk-wl6255 branch (marko.makela:3954 to 3955)

[marko.makela]

 3955 Marko Mäkelä	2012-06-08
      Adjust test results for duplicate key error reporting on rebuilt table.

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-table-online.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
      mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
 3954 Marko Mäkelä	2012-06-07
      WL#6255: Adjust main.mdl_sync, now that ADD COLUMN is in-place by default.

    modified:
      mysql-test/r/mdl_sync.result
      mysql-test/t/mdl_sync.test
=== modified file 'mysql-test/suite/innodb/r/innodb-index.result'
--- a/mysql-test/suite/innodb/r/innodb-index.result	revid:marko.makela@stripped
+++ b/mysql-test/suite/innodb/r/innodb-index.result	revid:marko.makela@stripped
@@ -100,7 +100,7 @@ affected rows: 1
 alter table t1 add primary key (c);
 ERROR 42000: Multiple primary key defined
 alter table t1 drop primary key, add primary key (b);
-ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
 create unique index c on t1 (c);
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
@@ -672,11 +672,11 @@ drop table t1;
 create table t1(a int not null, b int) engine = innodb;
 insert into t1 values (1,1),(1,1),(1,1),(1,1);
 alter table t1 add unique index (a);
-ERROR 23000: Duplicate entry '1' for key 'a'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 alter table t1 add unique index (b);
 ERROR 23000: Duplicate entry '1' for key 'b'
 alter table t1 add unique index (a), add unique index(b);
-ERROR 23000: Duplicate entry '1' for key 'a'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/suite/innodb/r/innodb-table-online.result'
--- a/mysql-test/suite/innodb/r/innodb-table-online.result	revid:marko.makela@stripped8h101obd4j
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result	revid:marko.makela@stripped-jheryqzuj31rv3k1
@@ -52,7 +52,7 @@ ALTER TABLE t1 DROP PRIMARY KEY, ADD UNI
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 COMMIT;
 ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2);
-ERROR 23000: Duplicate entry '4' for key 'c2'
+ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 DELETE FROM t1 WHERE c1 = 7;
 ALTER TABLE t1 DROP PRIMARY KEY, ADD UNIQUE INDEX(c2), ROW_FORMAT=COMPACT,
 LOCK = SHARED, ALGORITHM = INPLACE;
@@ -89,7 +89,7 @@ ddl_pending_alter_table	1
 BEGIN;
 INSERT INTO t1 VALUES(4,7,2);
 SET DEBUG_SYNC = 'now SIGNAL insert_done';
-ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '7' for key 'c2'
 ROLLBACK;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -213,7 +213,7 @@ SET DEBUG_SYNC = 'row_log_table_apply1_b
 ALTER TABLE t1 ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
 ERROR 42000: Multiple primary key defined
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c22f), CHANGE c2 c22f INT;
-ERROR 23000: Duplicate entry '5' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(c1,c22f,c4(5)),
 CHANGE c2 c22f INT, CHANGE c3 c3 TEXT NULL, CHANGE c1 c1 INT AFTER c22f,
 ADD COLUMN c4 VARCHAR(6) DEFAULT 'Online';
@@ -252,7 +252,7 @@ CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5));
-ERROR 23000: Duplicate entry '' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '1-5-Onlin' for key 'PRIMARY'
 UPDATE t1 SET c3 = NULL WHERE c3 = '';
 SET lock_wait_timeout = 1;
 ALTER TABLE t1 DROP COLUMN c22f, ADD PRIMARY KEY c3p5(c3(5));

=== modified file 'mysql-test/suite/innodb/r/innodb_16k.result'
--- a/mysql-test/suite/innodb/r/innodb_16k.result	revid:marko.makela@stripped01obd4j
+++ b/mysql-test/suite/innodb/r/innodb_16k.result	revid:marko.makela@strippedrv3k1
@@ -323,10 +323,10 @@ a	LENGTH(b)	b=LEFT(REPEAT(d,100*a),65535
 66	65535	1	15840	1	adfdpplkeock
 66	65535	1	13200	1	jejdkrun87
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
-ERROR 23000: Duplicate entry '22' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 DELETE FROM t1 WHERE d='null';
 ALTER TABLE t1 ADD PRIMARY KEY (a), ADD KEY (b(20));
-ERROR 23000: Duplicate entry '22' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 DELETE FROM t1 WHERE a%2;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text

=== modified file 'mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result'
--- a/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	revid:marko.makela@strippedom-20120607143132-jqkyge8h101obd4j
+++ b/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	revid:marko.makela@stripped
@@ -1351,7 +1351,7 @@ REPEAT("o", 4000));
 INSERT INTO worklog5743
 VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
 ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000));
-ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
+ERROR 23000: Duplicate entry '' for key '*UNKNOWN*'
 DROP TABLE worklog5743;
 set global innodb_large_prefix=0;
 CREATE TABLE worklog5743 (

=== modified file 'mysql-test/suite/rpl/r/rpl_relay_space_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result	revid:marko.makela@strippedm-20120607143132-jqkyge8h101obd4j
+++ b/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result	revid:[e-mail]-20120607211306-jheryqzuj31rv3k1
@@ -10,7 +10,8 @@ CREATE TABLE t1 (name varchar(64), age s
 INSERT INTO t1 SET name='Andy', age=31;
 INSERT INTO t1 SET name='Jacob', age=2;
 INSERT INTO t1 SET name='Caleb', age=1;
-ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY;
+ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY,
+ALGORITHM=COPY;
 SELECT * FROM t1 ORDER BY id;
 name	age	id
 Andy	31	00000001

No bundle (reason: useless for push emails).