Commit 70dcbf9e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1-wl1563-msg 

into  mysql.com:/home/mydev/mysql-5.1-bug8841
parents 91524125 77b746b7

mysql-test/r/binlog_row_insert_select.result

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ create table t2(a int); 
insert into t2 values(1),(2);

reset master;

insert into t1 select * from t2;

ERROR 23000: Duplicate entry '2' for key 1

ERROR 23000: Duplicate entry '2' for key 'a'

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
@@ -19,7 +19,7 @@ create table t1(a int); 
insert into t1 values(1),(1);

reset master;

create table t2(unique(a)) select a from t1;

ERROR 23000: Duplicate entry '1' for key 1

ERROR 23000: Duplicate entry '1' for key 'a'

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

mysql-test/r/rpl_row_basic_2myisam.result

+3 −3
Original line number Diff line number Diff line
@@ -392,11 +392,11 @@ DROP TABLE t7; 
CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'MYISAM'  ;

INSERT INTO t7 VALUES (99,99,99);

INSERT INTO t7 VALUES (99,22,33);

ERROR 23000: Duplicate entry '99' for key 1

ERROR 23000: Duplicate entry '99' for key 'PRIMARY'

INSERT INTO t7 VALUES (11,99,33);

ERROR 23000: Duplicate entry '99' for key 2

ERROR 23000: Duplicate entry '99' for key 'b'

INSERT INTO t7 VALUES (11,22,99);

ERROR 23000: Duplicate entry '99' for key 3

ERROR 23000: Duplicate entry '99' for key 'c'

SELECT * FROM t7 ORDER BY a;

a	b	c

99	99	99

mysql-test/r/rpl_row_basic_3innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -392,11 +392,11 @@ DROP TABLE t7; 
CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'INNODB'  ;

INSERT INTO t7 VALUES (99,99,99);

INSERT INTO t7 VALUES (99,22,33);

ERROR 23000: Duplicate entry '99' for key 1

ERROR 23000: Duplicate entry '99' for key 'PRIMARY'

INSERT INTO t7 VALUES (11,99,33);

ERROR 23000: Duplicate entry '99' for key 2

ERROR 23000: Duplicate entry '99' for key 'b'

INSERT INTO t7 VALUES (11,22,99);

ERROR 23000: Duplicate entry '99' for key 3

ERROR 23000: Duplicate entry '99' for key 'c'

SELECT * FROM t7 ORDER BY a;

a	b	c

99	99	99

mysql-test/r/rpl_row_create_table.result

+2 −2
Original line number Diff line number Diff line
@@ -126,12 +126,12 @@ NULL 4 2 
NULL	5	10

NULL	6	12

CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;

ERROR 23000: Duplicate entry '2' for key 1

ERROR 23000: Duplicate entry '2' for key 'b'

SHOW BINLOG EVENTS FROM 1256;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

CREATE TABLE t7 (a INT, b INT UNIQUE);

INSERT INTO t7 SELECT a,b FROM tt3;

ERROR 23000: Duplicate entry '2' for key 1

ERROR 23000: Duplicate entry '2' for key 'b'

SELECT * FROM t7 ORDER BY a,b;

a	b

1	2