bk commit into 5.0 tree (monty:1.1924)

[monty]

Below is the list of changes that have just been committed into a local
5.0 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.1924 05/04/30 18:40:08 monty@stripped +2 -0
  After merge fixes

  mysql-test/r/cast.result
    1.29 05/04/30 18:40:05 monty@stripped +2 -0
    Updated results after merge

  Makefile.am
    1.67 05/04/30 18:40:05 monty@stripped +5 -0
    Added target test-force

# 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.com
# Root:	/home/my/mysql-5.0

--- 1.66/Makefile.am	2005-03-17 02:22:48 +02:00
+++ 1.67/Makefile.am	2005-04-30 18:40:05 +03:00
@@ -102,5 +102,10 @@
 test:
 	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
 
+test-force:
+	cd mysql-test; \
+	mysql-test-run --force ;\
+	mysql-test-run --ps-protocol --force
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.28/mysql-test/r/cast.result	2005-04-30 09:46:04 +03:00
+++ 1.29/mysql-test/r/cast.result	2005-04-30 18:40:05 +03:00
@@ -7,6 +7,8 @@
 select CAST('10 ' as unsigned integer);
 CAST('10 ' as unsigned integer)
 10
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '10 '
 select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1;
 cast(-5 as unsigned) | 1	cast(-5 as unsigned) & -1
 18446744073709551611	18446744073709551611