after merge fix.

ad425304 · ramil/ram@mysql.com/myoffice.izhnet.ru · 1b488c7f · ad425304
Commit ad425304 authored Jan 19, 2007 by ramil/ram@mysql.com/myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

mysql-test/r/select.result mysql-test/r/select.result +5 -5

No files found.
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2816,11 +2816,11 @@ insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
 (0x10000000000000000, 0x10000000000000000), 
 (0x8fffffffffffffff, 0x8fffffffffffffff);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'a' at row 1
-Warning	1264	Out of range value adjusted for column 'b' 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 'b' at row 2
-Warning	1264	Out of range value adjusted for column 'b' at row 3
+Warning	1264	Out of range value for column 'a' at row 1
+Warning	1264	Out of range value for column 'b' at row 1
+Warning	1264	Out of range value for column 'a' at row 2
+Warning	1264	Out of range value for column 'b' at row 2
+Warning	1264	Out of range value for column 'b' at row 3
 select hex(a), hex(b) from t1;
 hex(a)	hex(b)
 FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF