After merge fix

9535b127 · unknown · 54849724 · 9535b127
Commit 9535b127 authored May 05, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -3394,19 +3394,19 @@ CREATE TABLE t1 (i TINYINT UNSIGNED NOT NULL);
 INSERT t1 SET i = 0;
 UPDATE t1 SET i = -1;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'i' at row 1
+Warning	1264	Out of range value for column 'i' at row 1
 SELECT * FROM t1;
 i
 0
 UPDATE t1 SET i = CAST(i - 1 AS SIGNED);
 Warnings:
-Warning	1264	Out of range value adjusted for column 'i' at row 1
+Warning	1264	Out of range value for column 'i' at row 1
 SELECT * FROM t1;
 i
 0
 UPDATE t1 SET i = i - 1;
 Warnings:
-Warning	1264	Out of range value adjusted for column 'i' at row 1
+Warning	1264	Out of range value for column 'i' at row 1
 SELECT * FROM t1;
 i
 255