From: Date: May 30 2007 2:04pm Subject: bk commit into 5.0 tree (gluh:1.2505) BUG#11491 List-Archive: http://lists.mysql.com/commits/27675 X-Bug: 11491 Message-Id: <20070530120408.A229524A0079@eagle.localdomain> Below is the list of changes that have just been committed into a local 5.0 repository of gluh. When gluh does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-05-30 17:04:04+05:00, gluh@stripped +19 -0 backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL mysql-test/r/auto_increment.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +2 -2 result fix mysql-test/r/create.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/insert.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/insert_select.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +2 -2 result fix mysql-test/r/insert_update.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +2 -2 result fix mysql-test/r/key.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +2 -2 result fix mysql-test/r/null.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +9 -9 result fix mysql-test/r/null_key.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/ps_2myisam.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/ps_3innodb.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/ps_4heap.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/ps_5merge.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +2 -2 result fix mysql-test/r/ps_6bdb.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/ps_7ndb.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +1 -1 result fix mysql-test/r/strict.result@stripped, 2007-05-30 17:04:02+05:00, gluh@stripped +9 -9 result fix mysql-test/r/view.result@stripped, 2007-05-30 17:04:03+05:00, gluh@stripped +1 -1 result fix mysql-test/r/warnings.result@stripped, 2007-05-30 17:04:03+05:00, gluh@stripped +3 -3 result fix mysql-test/t/strict.test@stripped, 2007-05-30 17:04:03+05:00, gluh@stripped +4 -4 test fix sql/field_conv.cc@stripped, 2007-05-30 17:04:03+05:00, gluh@stripped +1 -2 backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: gluh # Host: eagle.(none) # Root: /home/gluh/MySQL/Merge/5.0-opt --- 1.65/sql/field_conv.cc 2007-05-21 13:27:31 +05:00 +++ 1.66/sql/field_conv.cc 2007-05-30 17:04:03 +05:00 @@ -177,8 +177,7 @@ set_field_to_null_with_conversions(Field } if (current_thd->count_cuted_fields == CHECK_FIELD_WARN) { - field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_NULL_TO_NOTNULL, 1); + field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_BAD_NULL_ERROR, 1); return 0; } if (!current_thd->no_errors) --- 1.201/mysql-test/r/view.result 2007-05-24 07:04:09 +05:00 +++ 1.202/mysql-test/r/view.result 2007-05-30 17:04:03 +05:00 @@ -1497,7 +1497,7 @@ insert into v3(b) values (10); insert into v3(a) select a from t2; insert into v3(b) select b from t2; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2 +Warning 1048 Column 'a' cannot be null insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a); select * from t1; a b --- 1.48/mysql-test/r/ps_2myisam.result 2007-05-28 03:05:32 +05:00 +++ 1.49/mysql-test/r/ps_2myisam.result 2007-05-30 17:04:02 +05:00 @@ -1304,7 +1304,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.51/mysql-test/r/ps_3innodb.result 2007-05-28 03:05:33 +05:00 +++ 1.52/mysql-test/r/ps_3innodb.result 2007-05-30 17:04:02 +05:00 @@ -1287,7 +1287,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.47/mysql-test/r/ps_4heap.result 2007-05-28 03:05:33 +05:00 +++ 1.48/mysql-test/r/ps_4heap.result 2007-05-30 17:04:02 +05:00 @@ -1288,7 +1288,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.48/mysql-test/r/ps_5merge.result 2007-05-28 03:05:33 +05:00 +++ 1.49/mysql-test/r/ps_5merge.result 2007-05-30 17:04:02 +05:00 @@ -1330,7 +1330,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two @@ -4351,7 +4351,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.51/mysql-test/r/ps_6bdb.result 2007-05-28 03:05:33 +05:00 +++ 1.52/mysql-test/r/ps_6bdb.result 2007-05-30 17:04:02 +05:00 @@ -1287,7 +1287,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.51/mysql-test/r/ps_7ndb.result 2007-05-28 03:05:33 +05:00 +++ 1.52/mysql-test/r/ps_7ndb.result 2007-05-30 17:04:02 +05:00 @@ -1287,7 +1287,7 @@ set @arg00=NULL; set @arg01=2; execute stmt1 using @arg00, @arg01; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null select a,b from t1 order by a; a b 0 two --- 1.39/mysql-test/r/auto_increment.result 2006-08-02 17:15:46 +05:00 +++ 1.40/mysql-test/r/auto_increment.result 2007-05-30 17:04:02 +05:00 @@ -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 --- 1.127/mysql-test/r/create.result 2007-05-11 21:33:10 +05:00 +++ 1.128/mysql-test/r/create.result 2007-05-30 17:04:02 +05:00 @@ -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 --- 1.28/mysql-test/r/insert.result 2007-05-16 10:51:03 +05:00 +++ 1.29/mysql-test/r/insert.result 2007-05-30 17:04:02 +05:00 @@ -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 --- 1.46/mysql-test/r/insert_select.result 2007-03-22 20:44:15 +04:00 +++ 1.47/mysql-test/r/insert_select.result 2007-05-30 17:04:02 +05:00 @@ -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 --- 1.37/mysql-test/r/key.result 2007-05-22 17:58:29 +05:00 +++ 1.38/mysql-test/r/key.result 2007-05-30 17:04:02 +05:00 @@ -159,8 +159,8 @@ CREATE TABLE t1 (c CHAR(10) NOT NULL,i I UNIQUE (c,i)); INSERT INTO t1 (c) VALUES (NULL),(NULL); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c' at row 2 +Warning 1048 Column 'c' cannot be null +Warning 1048 Column 'c' cannot be null SELECT * FROM t1; c i 1 --- 1.35/mysql-test/r/null.result 2006-08-02 17:15:46 +05:00 +++ 1.36/mysql-test/r/null.result 2007-05-30 17:04:02 +05:00 @@ -97,39 +97,39 @@ Warnings: Warning 1265 Data truncated for column 'd' at row 1 UPDATE t1 SET d=NULL; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'd' at row 1 +Warning 1048 Column 'd' cannot be null INSERT INTO t1 (a) values (null); ERROR 23000: Column 'a' cannot be null INSERT INTO t1 (a) values (1/null); ERROR 23000: Column 'a' cannot be null INSERT INTO t1 (a) values (null),(null); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2 +Warning 1048 Column 'a' cannot be null +Warning 1048 Column 'a' cannot be null INSERT INTO t1 (b) values (null); ERROR 23000: Column 'b' cannot be null INSERT INTO t1 (b) values (1/null); ERROR 23000: Column 'b' cannot be null INSERT INTO t1 (b) values (null),(null); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 1 -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 +Warning 1048 Column 'b' cannot be null INSERT INTO t1 (c) values (null); ERROR 23000: Column 'c' cannot be null INSERT INTO t1 (c) values (1/null); ERROR 23000: Column 'c' cannot be null INSERT INTO t1 (c) values (null),(null); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c' at row 2 +Warning 1048 Column 'c' cannot be null +Warning 1048 Column 'c' cannot be null INSERT INTO t1 (d) values (null); ERROR 23000: Column 'd' cannot be null INSERT INTO t1 (d) values (1/null); ERROR 23000: Column 'd' cannot be null INSERT INTO t1 (d) values (null),(null); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'd' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'd' at row 2 +Warning 1048 Column 'd' cannot be null +Warning 1048 Column 'd' cannot be null select * from t1; a b c d 0 0000-00-00 00:00:00 0 --- 1.37/mysql-test/r/null_key.result 2007-02-01 07:31:34 +04:00 +++ 1.38/mysql-test/r/null_key.result 2007-05-30 17:04:02 +05:00 @@ -342,7 +342,7 @@ index (id2) ); insert into t1 values(null,null),(1,1); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'id2' at row 1 +Warning 1048 Column 'id2' cannot be null select * from t1; id id2 NULL 0 --- 1.35/mysql-test/r/strict.result 2007-05-21 23:50:01 +05:00 +++ 1.36/mysql-test/r/strict.result 2007-05-30 17:04:02 +05:00 @@ -993,16 +993,16 @@ ERROR 23000: Column 'col2' cannot be nul INSERT INTO t1 VALUES (103,'',NULL); ERROR 23000: Column 'col3' cannot be null UPDATE t1 SET col1=NULL WHERE col1 =100; -ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1 +ERROR 23000: Column 'col1' cannot be null UPDATE t1 SET col2 =NULL WHERE col2 ='hello'; -ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1 +ERROR 23000: Column 'col2' cannot be null UPDATE t1 SET col2 =NULL where col3 IS NOT NULL; -ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1 +ERROR 23000: Column 'col2' cannot be null INSERT IGNORE INTO t1 values (NULL,NULL,NULL); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col3' at row 1 +Warning 1048 Column 'col1' cannot be null +Warning 1048 Column 'col2' cannot be null +Warning 1048 Column 'col3' cannot be null SELECT * FROM t1; col1 col2 col3 100 hello 2004-08-20 @@ -1027,11 +1027,11 @@ ERROR HY000: Field 'col2' doesn't have a INSERT INTO t1 (col1) SELECT 1; ERROR HY000: Field 'col2' doesn't have a default value INSERT INTO t1 SELECT 1,NULL; -ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1 +ERROR 23000: Column 'col2' cannot be null INSERT IGNORE INTO t1 values (NULL,NULL); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1 -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1 +Warning 1048 Column 'col1' cannot be null +Warning 1048 Column 'col2' cannot be null INSERT IGNORE INTO t1 (col1) values (3); Warnings: Warning 1364 Field 'col2' doesn't have a default value --- 1.29/mysql-test/t/strict.test 2007-05-18 20:48:40 +05:00 +++ 1.30/mysql-test/t/strict.test 2007-05-30 17:04:03 +05:00 @@ -890,11 +890,11 @@ INSERT INTO t1 (col1,col2,col3) VALUES ( INSERT INTO t1 (col1,col2,col3) VALUES (102, NULL, '2004-01-01'); --error 1048 INSERT INTO t1 VALUES (103,'',NULL); ---error 1263 +--error 1048 UPDATE t1 SET col1=NULL WHERE col1 =100; ---error 1263 +--error 1048 UPDATE t1 SET col2 =NULL WHERE col2 ='hello'; ---error 1263 +--error 1048 UPDATE t1 SET col2 =NULL where col3 IS NOT NULL; INSERT IGNORE INTO t1 values (NULL,NULL,NULL); SELECT * FROM t1; @@ -914,7 +914,7 @@ INSERT INTO t1 (col1) VALUES (2); INSERT INTO t1 VALUES(default(col1),default(col2)); --error 1364 INSERT INTO t1 (col1) SELECT 1; ---error 1263 +--error 1048 INSERT INTO t1 SELECT 1,NULL; INSERT IGNORE INTO t1 values (NULL,NULL); INSERT IGNORE INTO t1 (col1) values (3); --- 1.40/mysql-test/r/warnings.result 2006-10-03 17:24:39 +05:00 +++ 1.41/mysql-test/r/warnings.result 2007-05-30 17:04:03 +05:00 @@ -86,7 +86,7 @@ drop table t1; create table t1(a tinyint NOT NULL, b tinyint unsigned, c char(5)); insert into t1 values(NULL,100,'mysql'),(10,-1,'mysql ab'),(500,256,'open source'),(20,NULL,'test'); Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1 +Warning 1048 Column 'a' cannot be null Warning 1264 Out of range value adjusted for column 'b' at row 2 Warning 1265 Data truncated for column 'c' at row 2 Warning 1264 Out of range value adjusted for column 'a' at row 3 @@ -99,7 +99,7 @@ Warning 1265 Data truncated for column ' alter table t1 add d char(2); update t1 set a=NULL where a=10; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2 +Warning 1048 Column 'a' cannot be null update t1 set c='mysql ab' where c='test'; Warnings: Warning 1265 Data truncated for column 'c' at row 4 @@ -115,7 +115,7 @@ Warnings: Warning 1265 Data truncated for column 'b' at row 1 Warning 1265 Data truncated for column 'b' at row 2 Warning 1265 Data truncated for column 'b' at row 3 -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 Warning 1265 Data truncated for column 'b' at row 4 insert into t2(b) values('mysqlab'); Warnings: --- 1.26/mysql-test/r/insert_update.result 2007-05-11 03:14:02 +05:00 +++ 1.27/mysql-test/r/insert_update.result 2007-05-30 17:04:02 +05:00 @@ -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