Commit 09a26785 authored by gluh@eagle.(none)'s avatar gluh@eagle.(none)
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
parents 7f63aab2 cdbdc4e7

mysql-test/r/auto_increment.result

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ a b 
delete from t1 where a=0;

update t1 set a=NULL where b=6;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 4

Warning	1048	Column 'a' cannot be null

update t1 set a=300 where b=7;

SET SQL_MODE='';

insert into t1(a,b)values(NULL,8);
@@ -274,7 +274,7 @@ a b 
delete from t1 where a=0;

update t1 set a=NULL where b=13;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 9

Warning	1048	Column 'a' cannot be null

update t1 set a=500 where b=14;

select * from t1 order by b;

a	b

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Warnings: 
Note	1050	Table 't1' already exists

insert into t1 values (""),(null);

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2

Warning	1048	Column 'b' cannot be null

select * from t1;

b

mysql-test/r/insert.result

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ insert into t1 values(NULL); 
ERROR 23000: Column 'id' cannot be null

insert into t1 values (1), (NULL), (2);

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'id' at row 2

Warning	1048	Column 'id' cannot be null

select * from t1;

id

1

mysql-test/r/insert_select.result

+2 −2
Original line number Diff line number Diff line
@@ -606,8 +606,8 @@ NULL 2 100 
create table t2(No int not null, Field int not null, Count int not null);

insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'No' at row 1

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'No' at row 2

Warning	1048	Column 'No' cannot be null

Warning	1048	Column 'No' cannot be null

select * from t2;

No	Field	Count

0	1	100

mysql-test/r/insert_update.result

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ id c1 cnt 
INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL

ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1

Warning	1048	Column 'c1' cannot be null

Error	1048	Column 'c1' cannot be null

SELECT * FROM t1;

id	c1	cnt
@@ -386,7 +386,7 @@ id c1 cnt 
INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2

ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;

Warnings:

Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1

Warning	1048	Column 'c1' cannot be null

Error	1048	Column 'c1' cannot be null

SELECT * FROM t1;

id	c1	cnt