Commit 674d57be authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.0-5.1.29-rc -> 5.0-bugteam

parents b2a49edd 707e676c

mysql-test/r/create.result

+11 −0
Original line number Diff line number Diff line
@@ -1546,4 +1546,15 @@ SHOW INDEX FROM t1; 
Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	c1	1	c1	A	NULL	NULL	NULL	YES	BTREE	

DROP TABLE t1;

CREATE TABLE t1 (a INTEGER AUTO_INCREMENT PRIMARY KEY, b INTEGER NOT NULL);

INSERT IGNORE INTO t1 (b) VALUES (5);

CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

SELECT a FROM t1;

CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

SELECT a FROM t1;

ERROR 23000: Duplicate entry '1' for key 1

DROP TABLE t1, t2;

End of 5.0 tests

mysql-test/r/default.result

+15 −0
Original line number Diff line number Diff line
@@ -205,4 +205,19 @@ Warnings: 
Warning	1364	Field 'id' doesn't have a default value

drop view v1;

drop table t1;

create table t1 (a int unique);

create table t2 (b int default 10);

insert into t1 (a) values (1);

insert into t2 (b) values (1);

insert into t1 (a) select b from t2 on duplicate key update a=default;

select * from t1;

a

NULL

insert into t1 (a) values (1);

insert into t1 (a) select b from t2 on duplicate key update a=default(b);

select * from t1;

a

NULL

10

drop table t1, t2;

End of 5.0 tests.

mysql-test/r/func_regexp.result

+12 −0
Original line number Diff line number Diff line
@@ -114,4 +114,16 @@ End of 4.1 tests 
SELECT 1 REGEXP NULL;

1 REGEXP NULL

NULL

SELECT '' REGEXP BINARY NULL;

'' REGEXP BINARY NULL

NULL

SELECT NULL REGEXP BINARY NULL;

NULL REGEXP BINARY NULL

NULL

SELECT 'A' REGEXP BINARY NULL;

'A' REGEXP BINARY NULL

NULL

SELECT "ABC" REGEXP BINARY NULL;

"ABC" REGEXP BINARY NULL

NULL

End of 5.0 tests

mysql-test/r/type_datetime.result

+23 −0
Original line number Diff line number Diff line
@@ -560,4 +560,27 @@ select * from t2 
where id in (select id from t2 as x1 where (t2.cur_date is null));

id	cur_date

drop table t1,t2;

SELECT 

CAST('NULL' AS DATE) <=> CAST('2008-01-01' AS DATE) n1, 

CAST('2008-01-01' AS DATE) <=> CAST('NULL' AS DATE) n2,

CAST('NULL' AS DATE) <=> CAST('NULL' AS DATE) n3,

CAST('NULL' AS DATE) <> CAST('2008-01-01' AS DATE) n4, 

CAST('2008-01-01' AS DATE) <> CAST('NULL' AS DATE) n5,

CAST('NULL' AS DATE) <> CAST('NULL' AS DATE) n6,

CAST('NULL' AS DATE) < CAST('2008-01-01' AS DATE) n7, 

CAST('2008-01-01' AS DATE) < CAST('NULL' AS DATE) n8,

CAST('NULL' AS DATE) < CAST('NULL' AS DATE) n9;

n1	n2	n3	n4	n5	n6	n7	n8	n9

0	0	1	NULL	NULL	NULL	NULL	NULL	NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

Warning	1292	Truncated incorrect datetime value: 'NULL'

End of 5.0 tests

mysql-test/t/create.test

+18 −0
Original line number Diff line number Diff line
@@ -1172,4 +1172,22 @@ SHOW INDEX FROM t1; 
DROP TABLE t1;





#

# Bug#38821: Assert table->auto_increment_field_not_null failed in open_table()

#

CREATE TABLE t1 (a INTEGER AUTO_INCREMENT PRIMARY KEY, b INTEGER NOT NULL);

INSERT IGNORE INTO t1 (b) VALUES (5);



CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

  SELECT a FROM t1;

--error 1062

CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

  SELECT a FROM t1;

--error 1062

CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)

  SELECT a FROM t1;



DROP TABLE t1, t2;





--echo End of 5.0 tests