Commit b5236ea7 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
parents 2449ef8f 5e68e501

mysql-test/r/auto_increment.result

+4 −4
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ id select_type table type possible_keys key key_len ref rows Extra 
Warnings:

Note	1003	select sql_no_cache last_insert_id() AS `last_insert_id()`

insert into t1 set i = 254;

ERROR 23000: Duplicate entry '254' for key 1

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

select last_insert_id();

last_insert_id()

255

insert into t1 set i = null;

ERROR 23000: Duplicate entry '255' for key 1

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

select last_insert_id();

last_insert_id()

0
@@ -178,7 +178,7 @@ select last_insert_id(); 
last_insert_id()

2

insert into t1 values (NULL, 10);

ERROR 23000: Duplicate entry '10' for key 2

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

select last_insert_id();

last_insert_id()

0
@@ -379,7 +379,7 @@ key (rowid), unique(val)); 
replace into t1 (val) values ('1'),('2');

replace into t1 (val) values ('1'),('2');

insert into t1 (val) values ('1'),('2');

ERROR 23000: Duplicate entry '1' for key 2

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

select * from t1;

rowid	val

3	1

mysql-test/r/bdb.result

+15 −15
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ id parent_id level 
15	102	2

update t1 set id=id+1000;

update t1 set id=1024 where id=1009;

ERROR 23000: Duplicate entry '1024' for key 1

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

select * from t1;

id	parent_id	level

1001	100	0
@@ -270,7 +270,7 @@ n after commit 
commit;

insert into t1 values (5);

insert into t1 values (4);

ERROR 23000: Duplicate entry '4' for key 1

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

commit;

select n, "after commit" from t1;

n	after commit
@@ -279,7 +279,7 @@ n after commit 
set autocommit=1;

insert into t1 values (6);

insert into t1 values (4);

ERROR 23000: Duplicate entry '4' for key 1

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

select n from t1;

n

4
@@ -343,7 +343,7 @@ drop table t1; 
CREATE TABLE t1 (id char(8) not null primary key, val int not null) engine=bdb;

insert into t1 values ('pippo', 12);

insert into t1 values ('pippo', 12);

ERROR 23000: Duplicate entry 'pippo' for key 1

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

delete from t1;

delete from t1 where id = 'pippo';

select * from t1;
@@ -498,9 +498,9 @@ UNIQUE ggid (ggid) 
insert into t1 (ggid,passwd) values ('test1','xxx');

insert into t1 (ggid,passwd) values ('test2','yyy');

insert into t1 (ggid,passwd) values ('test2','this will fail');

ERROR 23000: Duplicate entry 'test2' for key 2

ERROR 23000: Duplicate entry 'test2' for key 'ggid'

insert into t1 (ggid,id) values ('this will fail',1);

ERROR 23000: Duplicate entry '1' for key 1

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

select * from t1 where ggid='test1';

id	ggid	email	passwd

1	test1		xxx
@@ -513,7 +513,7 @@ id ggid email passwd 
replace into t1 (ggid,id) values ('this will work',1);

replace into t1 (ggid,passwd) values ('test2','this will work');

update t1 set id=100,ggid='test2' where id=1;

ERROR 23000: Duplicate entry 'test2' for key 2

ERROR 23000: Duplicate entry 'test2' for key 'ggid'

select * from t1;

id	ggid	email	passwd

1	this will work
@@ -1047,7 +1047,7 @@ create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(3 
insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL');

LOCK TABLES t1 WRITE;

insert into t1 values (99,1,2,'D'),(1,1,2,'D');

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

ERROR 23000: Duplicate entry '1-1' for key 'PRIMARY'

select id from t1;

id

0
@@ -1065,7 +1065,7 @@ insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJ 
LOCK TABLES t1 WRITE;

begin;

insert into t1 values (99,1,2,'D'),(1,1,2,'D');

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

ERROR 23000: Duplicate entry '1-1' for key 'PRIMARY'

select id from t1;

id

0
@@ -1487,7 +1487,7 @@ explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a ' 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	13	const	#	Using where

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

ERROR 23000: Duplicate entry '{ ' for key 'v_2'

alter table t1 add key(v);

select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';

qq
@@ -1847,16 +1847,16 @@ drop table t1; 
create table t1 (a char(10), unique (a));

insert into t1 values ('a   ');

insert into t1 values ('a ');

ERROR 23000: Duplicate entry 'a' for key 1

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

alter table t1 modify a varchar(10);

insert into t1 values ('a '),('a  '),('a   '),('a         ');

ERROR 23000: Duplicate entry 'a ' for key 1

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

insert into t1 values ('a     ');

ERROR 23000: Duplicate entry 'a     ' for key 1

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

insert into t1 values ('a          ');

ERROR 23000: Duplicate entry 'a         ' for key 1

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

insert into t1 values ('a ');

ERROR 23000: Duplicate entry 'a ' for key 1

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

update t1 set a='a  ' where a like 'a%';

select concat(a,'.') from t1;

concat(a,'.')

mysql-test/r/binlog_stm_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
@@ -18,7 +18,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/create.result

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ Note 1051 Unknown table 't2' 
CREATE TABLE t1 (a int not null);

INSERT INTO t1 values (1),(2),(1);

CREATE TABLE t2 (primary key(a)) SELECT * FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

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

SELECT * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

DROP TABLE t1;
@@ -280,7 +280,7 @@ create table if not exists t1 select 3 as 'a',4 as 'b'; 
Warnings:

Note	1050	Table 't1' already exists

create table if not exists t1 select 3 as 'a',3 as 'b';

ERROR 23000: Duplicate entry '3' for key 1

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

select * from t1;

a	b

1	1

mysql-test/r/create_select_tmp.result

+4 −4
Original line number Diff line number Diff line
@@ -2,19 +2,19 @@ drop table if exists t1, t2; 
CREATE TABLE t1 ( a int );

INSERT INTO t1 VALUES (1),(2),(1);

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

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

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

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

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

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

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

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

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;