Commit dc4418ed authored by unknown's avatar unknown
Browse files

Automerge fix: "Out of range value" error message adjusted to 5.1.

parent fd5ea175

mysql-test/r/log_tables.result

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ slow_log CREATE TABLE `slow_log` ( 
alter table mysql.general_log engine=myisam;

alter table mysql.slow_log engine=myisam;

Warnings:

Warning	1264	Out of range value for column 'last_insert_id' at row 0

Warning	1264	Out of range value for column 'insert_id' at row 0

Warning	1366	Incorrect integer value: '' for column 'last_insert_id' at row 0

Warning	1366	Incorrect integer value: '' for column 'insert_id' at row 0

show create table mysql.general_log;

Table	Create Table

general_log	CREATE TABLE `general_log` (

mysql-test/r/ps_2myisam.result

+12 −12
Original line number Diff line number Diff line
@@ -2689,12 +2689,12 @@ 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 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 ;
@@ -2739,12 +2739,12 @@ 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 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 ;

mysql-test/r/ps_3innodb.result

+12 −12
Original line number Diff line number Diff line
@@ -2672,12 +2672,12 @@ 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 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 ;
@@ -2722,12 +2722,12 @@ 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 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 ;

mysql-test/r/ps_4heap.result

+12 −12
Original line number Diff line number Diff line
@@ -2673,12 +2673,12 @@ 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 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 ;
@@ -2723,12 +2723,12 @@ 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 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 ;

mysql-test/r/ps_5merge.result

+24 −24
Original line number Diff line number Diff line
@@ -2609,12 +2609,12 @@ 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 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 ;
@@ -2659,12 +2659,12 @@ 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 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 ;
@@ -5623,12 +5623,12 @@ 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 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 ;
@@ -5673,12 +5673,12 @@ 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 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 ;