Below is the list of changes that have just been committed into a local
5.1 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
1.2002 05/12/02 15:01:44 gluh@stripped +35 -0
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-issue more correct message for incorrect date|datetime|time values
-ER_WARN_DATA_OUT_OF_RANGE message is changed
-added new error message
sql/time.cc
1.58 05/12/02 15:01:38 gluh@stripped +9 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
issue more correct message for incorrect date|datetime|time values
sql/share/errmsg.txt
1.57 05/12/02 15:01:38 gluh@stripped +3 -4
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-ER_WARN_DATA_OUT_OF_RANGE message is changed
-added new error message
mysql-test/r/warnings.result
1.37 05/12/02 15:01:38 gluh@stripped +34 -34
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/view.result
1.138 05/12/02 15:01:37 gluh@stripped +2 -2
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_uint.result
1.12 05/12/02 15:01:37 gluh@stripped +2 -2
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_time.result
1.14 05/12/02 15:01:37 gluh@stripped +3 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_ranges.result
1.39 05/12/02 15:01:37 gluh@stripped +21 -21
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_newdecimal.result
1.39 05/12/02 15:01:37 gluh@stripped +33 -33
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_float.result
1.43 05/12/02 15:01:37 gluh@stripped +15 -15
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_decimal.result
1.39 05/12/02 15:01:37 gluh@stripped +54 -54
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_datetime.result
1.31 05/12/02 15:01:37 gluh@stripped +15 -15
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_date.result
1.14 05/12/02 15:01:37 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_bit_innodb.result
1.4 05/12/02 15:01:37 gluh@stripped +2 -2
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/type_bit.result
1.15 05/12/02 15:01:37 gluh@stripped +3 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/timezone_grant.result
1.4 05/12/02 15:01:37 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/timezone2.result
1.13 05/12/02 15:01:37 gluh@stripped +9 -9
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/strict.result
1.27 05/12/02 15:01:37 gluh@stripped +175 -175
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/sp.result
1.173 05/12/02 15:01:37 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/rpl_rewrite_db.result
1.5 05/12/02 15:01:37 gluh@stripped +3 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_7ndb.result
1.40 05/12/02 15:01:37 gluh@stripped +68 -68
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_6bdb.result
1.41 05/12/02 15:01:37 gluh@stripped +68 -68
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_5merge.result
1.40 05/12/02 15:01:36 gluh@stripped +136 -136
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_4heap.result
1.39 05/12/02 15:01:36 gluh@stripped +68 -68
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_3innodb.result
1.43 05/12/02 15:01:36 gluh@stripped +68 -68
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ps_2myisam.result
1.40 05/12/02 15:01:36 gluh@stripped +68 -68
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/mysqldump.result
1.87 05/12/02 15:01:36 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/loaddata.result
1.21 05/12/02 15:01:36 gluh@stripped +3 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/insert.result
1.24 05/12/02 15:01:36 gluh@stripped +46 -46
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/func_time.result
1.48 05/12/02 15:01:36 gluh@stripped +16 -16
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/func_str.result
1.110 05/12/02 15:01:36 gluh@stripped +6 -6
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/func_sapdb.result
1.16 05/12/02 15:01:36 gluh@stripped +3 -3
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/date_formats.result
1.19 05/12/02 15:01:36 gluh@stripped +2 -2
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/ctype_ucs.result
1.40 05/12/02 15:01:36 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/bigint.result
1.32 05/12/02 15:01:36 gluh@stripped +7 -7
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
mysql-test/r/auto_increment.result
1.36 05/12/02 15:01:36 gluh@stripped +1 -1
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
result change
# 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.intranet.mysql.r18.ru
# Root: /home/gluh/MySQL/Merge/5.1-new
--- 1.57/sql/time.cc Sun Jul 31 14:49:47 2005
+++ 1.58/sql/time.cc Fri Dec 2 15:01:38 2005
@@ -711,9 +711,15 @@ void make_truncated_value_warning(THD *t
type_str, str.c_ptr(), field_name,
(ulong) thd->row_count);
else
- cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
- ER(ER_TRUNCATED_WRONG_VALUE),
- type_str, str.c_ptr());
+ {
+ if (time_type > MYSQL_TIMESTAMP_ERROR)
+ cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
+ ER(ER_TRUNCATED_WRONG_VALUE),
+ type_str, str.c_ptr());
+ else
+ cs->cset->snprintf(cs, warn_buff, sizeof(warn_buff),
+ ER(ER_WRONG_VALUE), type_str, str.c_ptr());
+ }
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_TRUNCATED_WRONG_VALUE, warn_buff);
}
--- 1.56/sql/share/errmsg.txt Thu Nov 24 04:56:09 2005
+++ 1.57/sql/share/errmsg.txt Fri Dec 2 15:01:38 2005
@@ -4898,10 +4898,7 @@ ER_WARN_NULL_TO_NOTNULL 22004
por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
spa "Datos truncado, NULL suministrado para NOT NULL columna '%s' en la línea %ld"
ER_WARN_DATA_OUT_OF_RANGE 22003
- eng "Out of range value adjusted for column '%s' at row %ld"
- ger "Daten abgeschnitten, außerhalb des Wertebereichs für Feld '%s' in Zeile %ld"
- por "Dado truncado, fora de alcance para coluna '%s' na linha %ld"
- spa "Datos truncados, fuera de gama para columna '%s' en la línea %ld"
+ eng "Out of range value for column '%s' at row %ld"
WARN_DATA_TRUNCATED 01000
eng "Data truncated for column '%s' at row %ld"
ger "Daten abgeschnitten für Feld '%s' in Zeile %ld"
@@ -5721,3 +5718,5 @@ ER_DROP_PARTITION_WHEN_FK_DEFINED
swe "Kan inte ta bort en partition när en främmande nyckel är definierad på
tabellen"
ER_PLUGIN_IS_NOT_LOADED
eng "Plugin '%-.64s' is not loaded"
+ER_WRONG_VALUE
+ eng "Incorrect %-.32s value: '%-.128s'"
--- 1.39/mysql-test/r/ctype_ucs.result Thu Oct 6 17:36:53 2005
+++ 1.40/mysql-test/r/ctype_ucs.result Fri Dec 2 15:01:36 2005
@@ -671,7 +671,7 @@ DROP TABLE t1;
CREATE TABLE t1 (Field1 int(10) unsigned default '0');
INSERT INTO t1 VALUES ('-1');
Warnings:
-Warning 1264 Out of range value adjusted for column 'Field1' at row 1
+Warning 1264 Out of range value for column 'Field1' at row 1
DROP TABLE t1;
SET NAMES latin1;
CREATE TABLE t1 (
--- 1.137/mysql-test/r/view.result Thu Dec 1 15:30:05 2005
+++ 1.138/mysql-test/r/view.result Fri Dec 2 15:01:37 2005
@@ -1306,9 +1306,9 @@ a b
delete from t1;
load data infile '../../std_data/loaddata3.dat' ignore into table v1 fields terminated by
'' enclosed by '' ignore 1 lines;
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 3
Error 1369 CHECK OPTION failed 'test.v1'
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 4
Error 1369 CHECK OPTION failed 'test.v1'
select * from t1;
a b
--- 1.12/mysql-test/r/timezone2.result Tue Jul 19 04:12:40 2005
+++ 1.13/mysql-test/r/timezone2.result Fri Dec 2 15:01:37 2005
@@ -117,9 +117,9 @@ insert into t1 values ('0000-00-00 00:00
('1970-01-01 00:00:00'),('1970-01-01 00:00:01'),
('2037-12-31 23:59:59'),('2038-01-01 00:00:00');
Warnings:
-Warning 1264 Out of range value adjusted for column 'ts' at row 2
-Warning 1264 Out of range value adjusted for column 'ts' at row 3
-Warning 1264 Out of range value adjusted for column 'ts' at row 6
+Warning 1264 Out of range value for column 'ts' at row 2
+Warning 1264 Out of range value for column 'ts' at row 3
+Warning 1264 Out of range value for column 'ts' at row 6
select * from t1;
ts
0000-00-00 00:00:00
@@ -134,9 +134,9 @@ insert into t1 values ('0000-00-00 00:00
('1970-01-01 01:00:00'),('1970-01-01 01:00:01'),
('2038-01-01 00:59:59'),('2038-01-01 01:00:00');
Warnings:
-Warning 1264 Out of range value adjusted for column 'ts' at row 2
-Warning 1264 Out of range value adjusted for column 'ts' at row 3
-Warning 1264 Out of range value adjusted for column 'ts' at row 6
+Warning 1264 Out of range value for column 'ts' at row 2
+Warning 1264 Out of range value for column 'ts' at row 3
+Warning 1264 Out of range value for column 'ts' at row 6
select * from t1;
ts
0000-00-00 00:00:00
@@ -151,9 +151,9 @@ insert into t1 values ('0000-00-00 00:00
('1970-01-01 01:30:00'),('1970-01-01 01:30:01'),
('2038-01-01 01:29:59'),('2038-01-01 01:30:00');
Warnings:
-Warning 1264 Out of range value adjusted for column 'ts' at row 2
-Warning 1264 Out of range value adjusted for column 'ts' at row 3
-Warning 1264 Out of range value adjusted for column 'ts' at row 6
+Warning 1264 Out of range value for column 'ts' at row 2
+Warning 1264 Out of range value for column 'ts' at row 3
+Warning 1264 Out of range value for column 'ts' at row 6
select * from t1;
ts
0000-00-00 00:00:00
--- 1.18/mysql-test/r/date_formats.result Thu Oct 27 22:04:31 2005
+++ 1.19/mysql-test/r/date_formats.result Fri Dec 2 15:01:36 2005
@@ -401,14 +401,14 @@ date format str_to_date
2003-01-02 10:11:12 %Y-%m-%d %h:%i:%S 2003-01-02 10:11:12
03-01-02 10:11:12 PM %Y-%m-%d %h:%i:%S %p 0003-01-02 22:11:12
Warnings:
-Warning 1292 Truncated incorrect datetime value: '10:20:10AM'
+Warning 1292 Incorrect datetime value: '10:20:10AM'
select date,format,concat(str_to_date(date, format),'') as con from t1;
date format con
10:20:10AM %h:%i:%s 0000-00-00 10:20:10
2003-01-02 10:11:12 %Y-%m-%d %h:%i:%S 2003-01-02 10:11:12
03-01-02 10:11:12 PM %Y-%m-%d %h:%i:%S %p 0003-01-02 22:11:12
Warnings:
-Warning 1292 Truncated incorrect datetime value: '10:20:10AM'
+Warning 1292 Incorrect datetime value: '10:20:10AM'
drop table t1;
select get_format(DATE, 'USA') as a;
a
--- 1.15/mysql-test/r/func_sapdb.result Tue Nov 1 20:47:51 2005
+++ 1.16/mysql-test/r/func_sapdb.result Fri Dec 2 15:01:36 2005
@@ -68,7 +68,7 @@ select datediff("1997-11-31 23:59:59.000
datediff("1997-11-31 23:59:59.000001","1997-12-31")
NULL
Warnings:
-Warning 1292 Truncated incorrect datetime value: '1997-11-31 23:59:59.000001'
+Warning 1292 Incorrect datetime value: '1997-11-31 23:59:59.000001'
select datediff("1997-11-30 23:59:59.000001",null);
datediff("1997-11-30 23:59:59.000001",null)
NULL
@@ -133,7 +133,7 @@ select timestamp("2001-13-01", "01:01:01
timestamp("2001-13-01", "01:01:01.000001")
NULL
Warnings:
-Warning 1292 Truncated incorrect datetime value: '2001-13-01'
+Warning 1292 Incorrect datetime value: '2001-13-01'
select timestamp("2001-12-01", "25:01:01");
timestamp("2001-12-01", "25:01:01")
2001-12-02 01:01:01
@@ -153,7 +153,7 @@ select date("1997-13-31 23:59:59.000001"
date("1997-13-31 23:59:59.000001")
NULL
Warnings:
-Warning 1292 Truncated incorrect datetime value: '1997-13-31 23:59:59.000001'
+Warning 1292 Incorrect datetime value: '1997-13-31 23:59:59.000001'
select time("1997-12-31 23:59:59.000001");
time("1997-12-31 23:59:59.000001")
23:59:59.000001
--- 1.39/mysql-test/r/ps_2myisam.result Thu Dec 1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_2myisam.result Fri Dec 2 15:01:36 2005
@@ -2570,12 +2570,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2593,12 +2593,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2616,12 +2616,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2639,12 +2639,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2662,14 +2662,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2693,8 +2693,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -2712,14 +2712,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2743,8 +2743,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -2975,45 +2975,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
--- 1.42/mysql-test/r/ps_3innodb.result Thu Dec 1 15:30:05 2005
+++ 1.43/mysql-test/r/ps_3innodb.result Fri Dec 2 15:01:36 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2676,8 +2676,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -2695,14 +2695,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2726,8 +2726,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -2958,45 +2958,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
--- 1.38/mysql-test/r/ps_4heap.result Thu Dec 1 15:30:05 2005
+++ 1.39/mysql-test/r/ps_4heap.result Fri Dec 2 15:01:36 2005
@@ -2554,12 +2554,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2577,12 +2577,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2600,12 +2600,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2623,12 +2623,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2646,14 +2646,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2677,8 +2677,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -2696,14 +2696,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2727,8 +2727,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -2959,45 +2959,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
--- 1.39/mysql-test/r/ps_5merge.result Thu Dec 1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_5merge.result Fri Dec 2 15:01:36 2005
@@ -2490,12 +2490,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2513,12 +2513,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2536,12 +2536,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2559,12 +2559,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2582,14 +2582,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2613,8 +2613,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -2632,14 +2632,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2663,8 +2663,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -2895,45 +2895,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
@@ -5502,12 +5502,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -5525,12 +5525,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -5548,12 +5548,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -5571,12 +5571,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -5594,14 +5594,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -5625,8 +5625,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -5644,14 +5644,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -5675,8 +5675,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -5907,45 +5907,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
--- 1.40/mysql-test/r/ps_6bdb.result Thu Dec 1 15:30:05 2005
+++ 1.41/mysql-test/r/ps_6bdb.result Fri Dec 2 15:01:37 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2676,8 +2676,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 1
c2 1
@@ -2695,14 +2695,14 @@ set @arg00= -1.11111111111111111111e+50
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2726,8 +2726,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column 'c4' at row 1
Warning 1265 Data truncated for column 'c5' at row 1
Warning 1265 Data truncated for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -1
c2 -1
@@ -2958,45 +2958,45 @@ Warning 1265 Data truncated for column '
Warnings:
Warning 1265 Data truncated for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Warning 1264 Out of range value adjusted for column 'c13' at row 1
-Warning 1264 Out of range value adjusted for column 'c14' at row 1
+Warning 1264 Out of range value for column 'c13' at row 1
+Warning 1264 Out of range value for column 'c14' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
Warning 1265 Data truncated for column 'c15' at row 1
-Warning 1264 Out of range value adjusted for column 'c16' at row 1
-Warning 1264 Out of range value adjusted for column 'c17' at row 1
+Warning 1264 Out of range value for column 'c16' at row 1
+Warning 1264 Out of range value for column 'c17' at row 1
select c1, c13, c14, c15, c16, c17 from t9 order by c1 ;
c1 c13 c14 c15 c16 c17
20 1991-01-01 1991-01-01 01:01:01 1991-01-01 01:01:01 01:01:01 1991
--- 1.4/mysql-test/r/rpl_rewrite_db.result Wed Apr 6 21:15:28 2005
+++ 1.5/mysql-test/r/rpl_rewrite_db.result Fri Dec 2 15:01:37 2005
@@ -67,9 +67,9 @@ drop table t1;
create table t1 (a int, b char(10));
load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by ''
enclosed by '' ignore 1 lines;
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 3
Warning 1262 Row 3 was truncated; it contained more data than there were input columns
-Warning 1264 Out of range value adjusted for column 'a' at row 5
+Warning 1264 Out of range value for column 'a' at row 5
Warning 1262 Row 5 was truncated; it contained more data than there were input columns
select * from rewrite.t1;
a b
@@ -81,7 +81,7 @@ a b
truncate table t1;
load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by ''
enclosed by '' lines terminated by '' ignore 1 lines;
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 4
Warning 1261 Row 4 doesn't contain data for all columns
select * from rewrite.t1;
a b
--- 1.38/mysql-test/r/type_newdecimal.result Tue Nov 29 16:58:25 2005
+++ 1.39/mysql-test/r/type_newdecimal.result Fri Dec 2 15:01:37 2005
@@ -79,16 +79,16 @@ drop table t1;
create table t1 (a decimal(4,2));
insert into t1 value (10000), (1.1e10), ("11111"), (100000.1);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 2
-Warning 1264 Out of range value adjusted for column 'a' at row 3
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 2
+Warning 1264 Out of range value for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 4
insert into t1 value (-10000), (-1.1e10), ("-11111"), (-100000.1);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 2
-Warning 1264 Out of range value adjusted for column 'a' at row 3
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 2
+Warning 1264 Out of range value for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 4
select a from t1;
a
99.99
@@ -103,16 +103,16 @@ drop table t1;
create table t1 (a decimal(4,2) unsigned);
insert into t1 value (10000), (1.1e10), ("11111"), (100000.1);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 2
-Warning 1264 Out of range value adjusted for column 'a' at row 3
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 2
+Warning 1264 Out of range value for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 4
insert into t1 value (-10000), (-1.1e10), ("-11111"), (-100000.1);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 2
-Warning 1264 Out of range value adjusted for column 'a' at row 3
-Warning 1264 Out of range value adjusted for column 'a' at row 4
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 2
+Warning 1264 Out of range value for column 'a' at row 3
+Warning 1264 Out of range value for column 'a' at row 4
select a from t1;
a
99.99
@@ -127,13 +127,13 @@ drop table t1;
create table t1 (a bigint);
insert into t1 values (18446744073709551615.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
insert into t1 values (9223372036854775808.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
insert into t1 values (-18446744073709551615.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
select * from t1;
a
9223372036854775807
@@ -145,10 +145,10 @@ insert into t1 values (18446744073709551
insert into t1 values (9223372036854775808.0);
insert into t1 values (9999999999999999999999999.000);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
insert into t1 values (-1.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
select * from t1;
a
18446744073709551615
@@ -159,12 +159,12 @@ drop table t1;
create table t1 (a tinyint);
insert into t1 values (18446744073709551615.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
insert into t1 values (9223372036854775808.0);
Warnings:
-Warning 1264 Out of range value adjusted for column 'a' at row 1
-Warning 1264 Out of range value adjusted for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
+Warning 1264 Out of range value for column 'a' at row 1
select * from t1;
a
127
@@ -806,9 +806,9 @@ Warnings:
Note 1265 Data truncated for column 'col1' at row 1
INSERT INTO Sow6_2f VALUES (11);
INSERT INTO Sow6_2f VALUES (101.55);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
UPDATE Sow6_2f SET col1 = col1 * 50 WHERE col1 = 11;
-ERROR 22003: Out of range value adjusted for column 'col1' at row 5
+ERROR 22003: Out of range value for column 'col1' at row 5
UPDATE Sow6_2f SET col1 = col1 / 0 WHERE col1 > 0;
ERROR 22012: Division by 0
SELECT MOD(col1,0) FROM Sow6_2f;
@@ -872,13 +872,13 @@ NULL
set @@sql_mode='traditional';
create table t1( d1 decimal(18) unsigned, d2 decimal(20) unsigned, d3 decimal (22)
unsigned);
insert into t1 values(1,-1,-1);
-ERROR 22003: Out of range value adjusted for column 'd2' at row 1
+ERROR 22003: Out of range value for column 'd2' at row 1
drop table t1;
create table t1 (col1 decimal(5,2), col2 numeric(5,2));
insert into t1 values (999.999,999.999);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
insert into t1 values (-999.999,-999.999);
-ERROR 22003: Out of range value adjusted for column 'col1' at row 1
+ERROR 22003: Out of range value for column 'col1' at row 1
select * from t1;
col1 col2
drop table t1;
@@ -1379,7 +1379,7 @@ insert into t1 values(
89000000000000000000000000000000000000000000000000000000000000000000000000000000000000000);
Warnings:
Error 1292 Truncated incorrect DECIMAL value: ''
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
insert into t1 values(
99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
*
99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999);
@@ -1387,10 +1387,10 @@ Warnings:
Error 1292 Truncated incorrect DECIMAL value: ''
Error 1292 Truncated incorrect DECIMAL value: ''
Error 1292 Truncated incorrect DECIMAL value: ''
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
insert into t1 values(1e100);
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
select * from t1;
c1
9999999999999999999999999999999999999999999999999999999999999999
--- 1.3/mysql-test/r/timezone_grant.result Tue Jul 19 01:49:14 2005
+++ 1.4/mysql-test/r/timezone_grant.result Fri Dec 2 15:01:37 2005
@@ -38,7 +38,7 @@ select convert_tz('2004-11-31 12:00:00',
convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')
NULL
Warnings:
-Warning 1292 Truncated incorrect datetime value: '2004-11-31 12:00:00'
+Warning 1292 Incorrect datetime value: '2004-11-31 12:00:00'
select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
convert_tz(b, 'Europe/Moscow', 'UTC')
update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
--- 1.39/mysql-test/r/ps_7ndb.result Thu Dec 1 15:30:05 2005
+++ 1.40/mysql-test/r/ps_7ndb.result Fri Dec 2 15:01:37 2005
@@ -2553,12 +2553,12 @@ set @arg00= 9223372036854775807 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2576,12 +2576,12 @@ set @arg00= '9223372036854775807' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2599,12 +2599,12 @@ set @arg00= -9223372036854775808 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2622,12 +2622,12 @@ set @arg00= '-9223372036854775808' ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 -128
c2 -32768
@@ -2645,14 +2645,14 @@ set @arg00= 1.11111111111111111111e+50 ;
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
@arg00, @arg00, @arg00, @arg00, @arg00 ;
Warnings:
-Warning 1264 Out of range value adjusted for column 'c1' at row 1
-Warning 1264 Out of range value adjusted for column 'c2' at row 1
-Warning 1264 Out of range value adjusted for column 'c3' at row 1
-Warning 1264 Out of range value adjusted for column 'c4' at row 1
-Warning 1264 Out of range value adjusted for column 'c5' at row 1
-Warning 1264 Out of range value adjusted for column 'c6' at row 1
-Warning 1264 Out of range value adjusted for column 'c7' at row 1
-Warning 1264 Out of range value adjusted for column 'c12' at row 1
+Warning 1264 Out of range value for column 'c1' at row 1
+Warning 1264 Out of range value for column 'c2' at row 1
+Warning 1264 Out of range value for column 'c3' at row 1
+Warning 1264 Out of range value for column 'c4' at row 1
+Warning 1264 Out of range value for column 'c5' at row 1
+Warning 1264 Out of range value for column 'c6' at row 1
+Warning 1264 Out of range value for column 'c7' at row 1
+Warning 1264 Out of range value for column 'c12' at row 1
execute my_select ;
c1 127
c2 32767
@@ -2676,8 +2676,8 @@ Warning 1265 Data truncated for column '
Warning 1265 Data truncated for column ' 