summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorevgen@moonbone.local <>2007-03-11 00:26:45 +0300
committerevgen@moonbone.local <>2007-03-11 00:26:45 +0300
commit11d37efa5e117c5f64870a00ec56b438b7e4dca9 (patch)
tree5688018d1c55ec2c3e437747634fd4fe63bd4f4e /mysql-test/r/union.result
parenteca8b1a62d6adcf626e1620e6a988b1077f49ca7 (diff)
parentf3e56b5adb2208f5db63c8821b9bf44f7568b4af (diff)
downloadmariadb-git-11d37efa5e117c5f64870a00ec56b438b7e4dca9.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 2a465364045..2c33ffc08d7 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -480,7 +480,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
2 UNION t2 const PRIMARY PRIMARY 4 const 1 100.00
NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL NULL
Warnings:
-Note 1003 (select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (`test`.`t1`.`a` = 1)) union (select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b` from `test`.`t2` where (`test`.`t2`.`a` = 1))
+Note 1003 (select '1' AS `a`,'1' AS `b` from `test`.`t1` where ('1' = 1)) union (select '1' AS `a`,'10' AS `b` from `test`.`t2` where ('1' = 1))
(select * from t1 where a=5) union (select * from t2 where a=1);
a b
1 10