MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:August 2 2006 12:15pm
Subject:bk commit into 5.0 tree (svoj:1.2240) BUG#14770
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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, 2006-08-02 17:15:50+05:00, svoj@stripped +16 -0
  BUG#14770 - LOAD DATA INFILE doesn't respect default values for
              columns
  Fixed confusing warning.
  
  Quoting INSERT section of the manual:
  ----
  Inserting NULL into a column that has been declared NOT NULL. For
  multiple-row INSERT statements or INSERT INTO ... SELECT statements, the
  column is set to the implicit default value for the column data type. This
  is 0 for numeric types, the empty string ('') for string types, and the
  "zero" value for date and time types. INSERT INTO ... SELECT statements are
  handled the same way as multiple-row inserts because the server does not
  examine the result set from the SELECT to see whether it returns a single
  row. (For a single-row INSERT, no warning occurs when NULL is inserted into
  a NOT NULL column. Instead, the statement fails with an error.)
  ----
  This is also true for LOAD DATA INFILE. For INSERT user can specify
  DEFAULT keyword as a value to set column default. There is no similiar
  feature available for LOAD DATA INFILE.

  mysql-test/r/auto_increment.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +2 -2
    Fixed confusing warning.

  mysql-test/r/create.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/insert.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/insert_select.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +2 -2
    Fixed confusing warning.

  mysql-test/r/key.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +2 -2
    Fixed confusing warning.

  mysql-test/r/null.result@stripped, 2006-08-02 17:15:46+05:00, svoj@stripped +9 -9
    Fixed confusing warning.

  mysql-test/r/null_key.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_2myisam.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_3innodb.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_4heap.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/ps_5merge.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +2 -2
    Fixed confusing warning.

  mysql-test/r/ps_6bdb.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/strict.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +9 -9
    Fixed confusing warning.

  mysql-test/r/view.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +1 -1
    Fixed confusing warning.

  mysql-test/r/warnings.result@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +4 -4
    Fixed confusing warning.

  sql/share/errmsg.txt@stripped, 2006-08-02 17:15:47+05:00, svoj@stripped +2 -2
    Fixed confusing warning.

# 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:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines

--- 1.65/sql/share/errmsg.txt	2006-08-02 17:15:56 +05:00
+++ 1.66/sql/share/errmsg.txt	2006-08-02 17:15:56 +05:00
@@ -4893,8 +4893,8 @@
 ER_WARN_NULL_TO_NOTNULL 22004 
-	eng "Column set to default value; NULL supplied to NOT NULL column '%s' at row %ld"
+	eng "Column was set to data type implicit default; NULL supplied for NOT NULL column '%s' at row %ld"
 	por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
 ER_WARN_DATA_OUT_OF_RANGE 22003 

--- 1.162/mysql-test/r/view.result	2006-08-02 17:15:56 +05:00
+++ 1.163/mysql-test/r/view.result	2006-08-02 17:15:56 +05:00
@@ -1495,7 +1495,7 @@
 insert into v3(a) select a from t2;
 insert into v3(b) select b from t2;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2
 insert into v3(a) values (1) on duplicate key update a=a+10000+VALUES(a);
 select * from t1;
 a	b

--- 1.40/mysql-test/r/ps_2myisam.result	2006-08-02 17:15:56 +05:00
+++ 1.41/mysql-test/r/ps_2myisam.result	2006-08-02 17:15:56 +05:00
@@ -1304,7 +1304,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two

--- 1.43/mysql-test/r/ps_3innodb.result	2006-08-02 17:15:56 +05:00
+++ 1.44/mysql-test/r/ps_3innodb.result	2006-08-02 17:15:56 +05:00
@@ -1287,7 +1287,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two

--- 1.39/mysql-test/r/ps_4heap.result	2006-08-02 17:15:56 +05:00
+++ 1.40/mysql-test/r/ps_4heap.result	2006-08-02 17:15:56 +05:00
@@ -1288,7 +1288,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two

--- 1.40/mysql-test/r/ps_5merge.result	2006-08-02 17:15:56 +05:00
+++ 1.41/mysql-test/r/ps_5merge.result	2006-08-02 17:15:56 +05:00
@@ -1330,7 +1330,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two
@@ -4344,7 +4344,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two

--- 1.42/mysql-test/r/ps_6bdb.result	2006-08-02 17:15:56 +05:00
+++ 1.43/mysql-test/r/ps_6bdb.result	2006-08-02 17:15:56 +05:00
@@ -1287,7 +1287,7 @@
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 select a,b from t1 order by a;
 a	b
 0	two

--- 1.38/mysql-test/r/auto_increment.result	2006-08-02 17:15:56 +05:00
+++ 1.39/mysql-test/r/auto_increment.result	2006-08-02 17:15:56 +05:00
@@ -232,7 +232,7 @@
 delete from t1 where a=0;
 update t1 set a=NULL where b=6;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 4
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 4
 update t1 set a=300 where b=7;
 SET SQL_MODE='';
 insert into t1(a,b)values(NULL,8);
@@ -274,7 +274,7 @@
 delete from t1 where a=0;
 update t1 set a=NULL where b=13;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 9
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 9
 update t1 set a=500 where b=14;
 select * from t1 order by b;
 a	b

--- 1.118/mysql-test/r/create.result	2006-08-02 17:15:56 +05:00
+++ 1.119/mysql-test/r/create.result	2006-08-02 17:15:56 +05:00
@@ -13,7 +13,7 @@
 Note	1050	Table 't1' already exists
 insert into t1 values (""),(null);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2
 select * from t1;
 b
 

--- 1.24/mysql-test/r/insert.result	2006-08-02 17:15:56 +05:00
+++ 1.25/mysql-test/r/insert.result	2006-08-02 17:15:56 +05:00
@@ -63,7 +63,7 @@
 ERROR 23000: Column 'id' cannot be null
 insert into t1 values (1), (NULL), (2);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'id' at row 2
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'id' at row 2
 select * from t1;
 id
 1

--- 1.38/mysql-test/r/insert_select.result	2006-08-02 17:15:56 +05:00
+++ 1.39/mysql-test/r/insert_select.result	2006-08-02 17:15:56 +05:00
@@ -606,8 +606,8 @@
 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 set to default value; NULL supplied to NOT NULL column 'No' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'No' at row 2
+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
 select * from t2;
 No	Field	Count
 0	1	100

--- 1.34/mysql-test/r/key.result	2006-08-02 17:15:56 +05:00
+++ 1.35/mysql-test/r/key.result	2006-08-02 17:15:56 +05:00
@@ -159,8 +159,8 @@
 UNIQUE (c,i));
 INSERT INTO t1 (c) VALUES (NULL),(NULL);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'c' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'c' at row 2
+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
 SELECT * FROM t1;
 c	i
 	1

--- 1.34/mysql-test/r/null.result	2006-08-02 17:15:56 +05:00
+++ 1.35/mysql-test/r/null.result	2006-08-02 17:15:56 +05:00
@@ -97,39 +97,39 @@
 Warning	1265	Data truncated for column 'd' at row 1
 UPDATE t1 SET d=NULL;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to 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 1
 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 set to default value; NULL supplied to NOT NULL column 'a' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+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
 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 set to default value; NULL supplied to NOT NULL column 'b' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+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
 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 set to default value; NULL supplied to NOT NULL column 'c' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'c' at row 2
+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
 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 set to default value; NULL supplied to NOT NULL column 'd' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'd' at row 2
+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
 select * from t1;
 a	b	c	d
 	0	0000-00-00 00:00:00	0

--- 1.35/mysql-test/r/null_key.result	2006-08-02 17:15:56 +05:00
+++ 1.36/mysql-test/r/null_key.result	2006-08-02 17:15:56 +05:00
@@ -342,7 +342,7 @@
 );
 insert into t1 values(null,null),(1,1);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'id2' at row 1
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'id2' at row 1
 select * from t1;
 id	id2
 NULL	0

--- 1.27/mysql-test/r/strict.result	2006-08-02 17:15:56 +05:00
+++ 1.28/mysql-test/r/strict.result	2006-08-02 17:15:56 +05:00
@@ -989,16 +989,16 @@
 INSERT INTO t1 VALUES (103,'',NULL);
 ERROR 23000: Column 'col3' cannot be null
 UPDATE t1 SET col1=NULL WHERE col1 =100;
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col1' at row 1
 UPDATE t1 SET col2 =NULL WHERE col2 ='hello';
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
 UPDATE t1 SET col2 =NULL where col3 IS NOT NULL;
-ERROR 22004: Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
 INSERT IGNORE INTO t1 values (NULL,NULL,NULL);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'col3' at row 1
+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
 SELECT * FROM t1;
 col1	col2	col3
 100	hello	2004-08-20
@@ -1023,11 +1023,11 @@
 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 set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+ERROR 22004: Column was set to data type implicit default; NULL supplied for NOT NULL column 'col2' at row 1
 INSERT IGNORE INTO t1 values (NULL,NULL);
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'col1' at row 1
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'col2' at row 1
+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
 INSERT IGNORE INTO t1 (col1) values (3);
 Warnings:
 Warning	1364	Field 'col2' doesn't have a default value

--- 1.35/mysql-test/r/warnings.result	2006-08-02 17:15:56 +05:00
+++ 1.36/mysql-test/r/warnings.result	2006-08-02 17:15:56 +05:00
@@ -72,7 +72,7 @@
 create table t1(a tinyint, b int not null, c date, d char(5));
 load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2
 Warning	1265	Data truncated for column 'd' at row 3
 Warning	1265	Data truncated for column 'c' at row 4
 Warning	1261	Row 5 doesn't contain data for all columns
@@ -86,7 +86,7 @@
 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 set to default value; NULL supplied to 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 1
 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 @@
 alter table t1 add d char(2);
 update t1 set a=NULL where a=10;
 Warnings:
-Warning	1263	Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 2
 update t1 set c='mysql ab' where c='test';
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 4
@@ -115,7 +115,7 @@
 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 set to default value; NULL supplied to NOT NULL column 'a' at row 4
+Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 4
 Warning	1265	Data truncated for column 'b' at row 4
 insert into t2(b) values('mysqlab');
 Warnings:
Thread
bk commit into 5.0 tree (svoj:1.2240) BUG#14770Sergey Vojtovich2 Aug