From d1d474c812a1020af48bebe6ecc68bdc51d0674c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 30 Apr 2005 18:40:08 +0300 Subject: [PATCH] After merge fixes Makefile.am: Added target test-force mysql-test/r/cast.result: Updated results after merge --- Makefile.am | 5 +++++ mysql-test/r/cast.result | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Makefile.am b/Makefile.am index 78efd47b762..7905869f833 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,5 +102,10 @@ tags: 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.% diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index c5fa5d076cc..6dc608a9289 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -7,6 +7,8 @@ CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER) 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