Commit dfb019ea authored by unknown's avatar unknown
Browse files

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
parents a0933646 8c07265c

mysql-test/r/ctype_cp932.result

+12 −0
Original line number Diff line number Diff line
@@ -11353,3 +11353,15 @@ a 
a

a

drop table t1;

set names utf8;

create table t1 (a text) default character set cp932;

insert into t1 values (_utf8 0xE38182);

show warnings;

Level	Code	Message

select * from t1;

a

あ

select hex(a) from t1;

hex(a)

82A0

drop table t1;

mysql-test/r/innodb-replace.result

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ drop table if exists t1; 
create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb;

select * from t1;

c1	c2	stamp

replace delayed into t1 (c1, c2)  values ( "text1","11"),( "text2","12");

replace delayed into t1 (c1, c2)  values ( "text1","11");

ERROR HY000: Table storage engine for 't1' doesn't have this option

select * from t1;

c1	c2	stamp

replace delayed into t1 (c1, c2)  values ( "text1","12"),( "text2","13"),( "text3","14", "a" ),( "text4","15", "b" );

replace delayed into t1 (c1, c2)  values ( "text1","12");

ERROR HY000: Table storage engine for 't1' doesn't have this option

select * from t1;

c1	c2	stamp

mysql-test/r/rpl_insert_delayed.result

0 → 100644
+31 −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 (id INT primary key auto_increment, name VARCHAR(64));

truncate table t1;

insert delayed into t1 values(10, "my name");

insert delayed into t1 values(10, "is Bond"), (20, "James Bond");

ERROR 23000: Duplicate entry '10' for key 1

flush table t1;

select * from t1;

id	name

10	my name

select * from t1;

id	name

10	my name

delete from t1 where id!=10;

insert delayed into t1 values(20, "is Bond"), (10, "James Bond");

ERROR 23000: Duplicate entry '10' for key 1

flush table t1;

select * from t1;

id	name

10	my name

20	is Bond

select * from t1;

id	name

10	my name

20	is Bond

drop table t1;

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;