summaryrefslogtreecommitdiff
path: root/mysql-test/r/row.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-04-04 16:43:25 +0300
committerunknown <monty@mysql.com>2005-04-04 16:43:25 +0300
commitce169a5424e76969e74828d4214cfedb0a425ee5 (patch)
tree3ad1b7dadf9b015e59e0f817db58b9dbc155cb5e /mysql-test/r/row.result
parent0c9304fd6d9b1648f3157a6a5e3f0ec536d82560 (diff)
downloadmariadb-git-ce169a5424e76969e74828d4214cfedb0a425ee5.tar.gz
Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly
Fix that mysql.proc works with new VARCHAR fields Give warnings for wrong zero dates configure.in: Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly mysql-test/r/func_time.result: New warnings mysql-test/r/row.result: Moved code around to get things to work with --ps-protocol Note that one on warning disappered, but it should appear again when bug #9600 is fixed mysql-test/r/strict.result: enabled more tests Added more tests mysql-test/r/union.result: Test that UNION generates correct row format mysql-test/t/row.test: Moved test to get things to work with --ps-protocol mysql-test/t/strict.test: enabled more tests Added more tests mysql-test/t/union.test: Test that UNION generates correct row format sql/item.cc: Removed compiler warning Simple cleanup sql/sp.cc: Fix that mysql.proc works with new VARCHAR fields sql/time.cc: Give warnings for wrong zero dates tests/mysql_client_test.c: More startup information
Diffstat (limited to 'mysql-test/r/row.result')
-rw-r--r--mysql-test/r/row.result8
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result
index 691687762cb..0c75e80cb77 100644
--- a/mysql-test/r/row.result
+++ b/mysql-test/r/row.result
@@ -17,16 +17,14 @@ row('a',1.5,3) IN (row(1,2,3), row('a',1.5,3), row('a','a','a'))
Warnings:
Error 1366 Incorrect decimal value: '' for column '' at row -1
Warning 1292 Truncated incorrect INTEGER value: 'a'
-select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
-row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3))
-1
select row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3));
-Warnings:
-Warning 1292 Truncated incorrect INTEGER value: 'a'
row('a',0,3) IN (row(3,2,3), row('a','a','3'), row(1,3,3))
1
Warnings:
Warning 1292 Truncated incorrect INTEGER value: 'a'
+select row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3));
+row('a',0,3) IN (row(3,2,3), row('a','0','3'), row(1,3,3))
+1
select row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3));
row('a',1.5,3) IN (row(3,NULL,3), row('a',1.5,3), row(1,3,3))
1