summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_5merge.result
diff options
context:
space:
mode:
authorunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-10-03 18:48:50 +0500
committerunknown <bar@mysql.com/bar.intranet.mysql.r18.ru>2006-10-03 18:48:50 +0500
commitdc4418edcfd468a8f612aa04045abfe8fe3f0e1e (patch)
treee989d57f2e8553580bc7dd1b5aa6cb66c703dfa7 /mysql-test/r/ps_5merge.result
parentfd5ea175a32281319f41e64132d4a60040e8e8b7 (diff)
downloadmariadb-git-dc4418edcfd468a8f612aa04045abfe8fe3f0e1e.tar.gz
Automerge fix: "Out of range value" error message adjusted to 5.1.
Diffstat (limited to 'mysql-test/r/ps_5merge.result')
-rw-r--r--mysql-test/r/ps_5merge.result48
1 files changed, 24 insertions, 24 deletions
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 6c9a9af69ab..38e4626d59c 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -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 ;