bk commit into 5.1 tree (monty:1.2401)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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.2401 06/05/05 04:52:32 monty@stripped +1 -0
  After merge fix

  mysql-test/r/select.result
    1.122 06/05/05 04:52:28 monty@stripped +3 -3
    After merge fix

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.121/mysql-test/r/select.result	2006-05-04 17:05:16 +03:00
+++ 1.122/mysql-test/r/select.result	2006-05-05 04:52:28 +03:00
@@ -3394,19 +3394,19 @@
 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