Commit d1d474c8 authored by unknown's avatar unknown
Browse files

After merge fixes 


Makefile.am:
  Added target test-force
mysql-test/r/cast.result:
  Updated results after merge
parent a6acc446

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -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.%

mysql-test/r/cast.result

+2 −0
Original line number Diff line number Diff line
@@ -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