Commit f40fe807 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  gbichot3.local:/home/mysql_src/mysql-5.0-rpl-24432
parents fb33da5f 914ae41f

mysql-test/r/rpl_insert_id.result

+58 −0
Original line number Diff line number Diff line
@@ -234,6 +234,64 @@ n b 
2	100

3	350

drop table t1;

CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

UNIQUE(b));

INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

SELECT * FROM t1;

a	b

1	10

2	2

SELECT * FROM t1;

a	b

1	10

2	2

drop table t1;

CREATE TABLE t1 (

id bigint(20) unsigned NOT NULL auto_increment,

field_1 int(10) unsigned NOT NULL,

field_2 varchar(255) NOT NULL,

field_3 varchar(255) NOT NULL,

PRIMARY KEY (id),

UNIQUE KEY field_1 (field_1, field_2)

);

CREATE TABLE t2 (

field_a int(10) unsigned NOT NULL,

field_b varchar(255) NOT NULL,

field_c varchar(255) NOT NULL

);

INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (4, 'd', '4d');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (5, 'e', '5e');

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

INSERT INTO t2 (field_a, field_b, field_c) VALUES (6, 'f', '6f');

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

SELECT * FROM t1;

id	field_1	field_2	field_3

1	1	a	1a

2	2	b	2b

3	3	c	3c

4	4	d	4d

5	5	e	5e

6	6	f	6f

SELECT * FROM t1;

id	field_1	field_2	field_3

1	1	a	1a

2	2	b	2b

3	3	c	3c

4	4	d	4d

5	5	e	5e

6	6	f	6f

drop table t1, t2;

DROP PROCEDURE IF EXISTS p1;

DROP TABLE IF EXISTS t1, t2;

SELECT LAST_INSERT_ID(0);

mysql-test/r/rpl_known_bugs_detection.result

0 → 100644
+133 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

UNIQUE(b));

INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

SELECT * FROM t1;

a	b

1	10

2	2

show slave status;;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	#

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1105

Last_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'

Skip_Counter	0

Exec_Master_Log_Pos	238

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

SELECT * FROM t1;

a	b

stop slave;

reset slave;

reset master;

drop table t1;

start slave;

CREATE TABLE t1 (

id bigint(20) unsigned NOT NULL auto_increment,

field_1 int(10) unsigned NOT NULL,

field_2 varchar(255) NOT NULL,

field_3 varchar(255) NOT NULL,

PRIMARY KEY (id),

UNIQUE KEY field_1 (field_1, field_2)

);

CREATE TABLE t2 (

field_a int(10) unsigned NOT NULL,

field_b varchar(255) NOT NULL,

field_c varchar(255) NOT NULL

);

INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (4, 'd', '4d');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (5, 'e', '5e');

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

INSERT INTO t2 (field_a, field_b, field_c) VALUES (6, 'f', '6f');

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

SELECT * FROM t1;

id	field_1	field_2	field_3

1	1	a	1a

2	2	b	2b

3	3	c	3c

4	4	d	4d

5	5	e	5e

6	6	f	6f

show slave status;;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	#

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1105

Last_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c'

Skip_Counter	0

Exec_Master_Log_Pos	1270

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

SELECT * FROM t1;

id	field_1	field_2	field_3

drop table t1, t2;

drop table t1, t2;

mysql-test/t/rpl_insert_id.test

+53 −0
Original line number Diff line number Diff line
@@ -245,6 +245,59 @@ select * from t1 order by n; 
connection master;

drop table t1;



#

# BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"

#



# testcase with INSERT VALUES

CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

UNIQUE(b));

INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

SELECT * FROM t1;

sync_slave_with_master;

SELECT * FROM t1;

connection master;

drop table t1;



# tescase with INSERT SELECT

CREATE TABLE t1 (

  id bigint(20) unsigned NOT NULL auto_increment,

  field_1 int(10) unsigned NOT NULL,

  field_2 varchar(255) NOT NULL,

  field_3 varchar(255) NOT NULL,

  PRIMARY KEY (id),

  UNIQUE KEY field_1 (field_1, field_2)

);

CREATE TABLE t2 (

  field_a int(10) unsigned NOT NULL,

  field_b varchar(255) NOT NULL,

  field_c varchar(255) NOT NULL

);

INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (4, 'd', '4d');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (5, 'e', '5e');

# Updating table t1 based on values from table t2

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

# Inserting new record into t2

INSERT INTO t2 (field_a, field_b, field_c) VALUES (6, 'f', '6f');

# Updating t1 again

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

SELECT * FROM t1;

sync_slave_with_master;

SELECT * FROM t1;

connection master;

drop table t1, t2;



#

# BUG#20339: stored procedure using LAST_INSERT_ID() does not

# replicate statement-based

mysql-test/t/rpl_known_bugs_detection-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--loose-debug=d,pretend_version_50034_in_binlog

mysql-test/t/rpl_known_bugs_detection.test

0 → 100644
+90 −0
Original line number Diff line number Diff line 
# Test to see if slave can detect certain known bugs present

# on the master, and appropriately decides to stop

# (assuming the bug is fixed in the slave, slave cannot of course

# imitate the bug, so it has to stop).



source include/have_debug.inc;

source include/master-slave.inc;



#

# This is to test that slave properly detects if

# master may suffer from:

# BUG#24432 "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"

# (i.e. on master, INSERT ON DUPLICATE KEY UPDATE is used and manipulates

# an auto_increment column, and is binlogged statement-based).

#



# testcase with INSERT VALUES

CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY AUTO_INCREMENT, b INT,

UNIQUE(b));

sync_slave_with_master;

connection master;

INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10;

SELECT * FROM t1;

connection slave;

wait_for_slave_to_stop;

# show the error message

--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #

--query_vertical show slave status;

# show that it was not replicated

SELECT * FROM t1;



# restart replication for the next testcase

stop slave;

reset slave;

connection master;

reset master;

drop table t1;

connection slave;

start slave;



# testcase with INSERT SELECT

connection master;

CREATE TABLE t1 (

  id bigint(20) unsigned NOT NULL auto_increment,

  field_1 int(10) unsigned NOT NULL,

  field_2 varchar(255) NOT NULL,

  field_3 varchar(255) NOT NULL,

  PRIMARY KEY (id),

  UNIQUE KEY field_1 (field_1, field_2)

);

CREATE TABLE t2 (

  field_a int(10) unsigned NOT NULL,

  field_b varchar(255) NOT NULL,

  field_c varchar(255) NOT NULL

);

INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (2, 'b', '2b');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (3, 'c', '3c');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (4, 'd', '4d');

INSERT INTO t2 (field_a, field_b, field_c) VALUES (5, 'e', '5e');

sync_slave_with_master;

connection master;

# Updating table t1 based on values from table t2

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

# Inserting new record into t2

INSERT INTO t2 (field_a, field_b, field_c) VALUES (6, 'f', '6f');

# Updating t1 again

INSERT INTO t1 (field_1, field_2, field_3)

SELECT t2.field_a, t2.field_b, t2.field_c

FROM t2

ON DUPLICATE KEY UPDATE

t1.field_3 = t2.field_c;

SELECT * FROM t1;

connection slave;

wait_for_slave_to_stop;

# show the error message

--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #

--query_vertical show slave status;

# show that it was not replicated

SELECT * FROM t1;

connection master;

drop table t1, t2;

connection slave;

drop table t1, t2;



# End of 5.0 tests