diff options
| author | unknown <evgen@moonbone.local> | 2007-03-10 19:53:59 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-10 19:53:59 +0300 |
| commit | c0a0543545bc7b3e2ce9aec787452e7bd619f3d3 (patch) | |
| tree | 2bd4a38243a497e5b2768e5e3860cb5c54de471e /mysql-test/r/union.result | |
| parent | 4d6ad7ac60a0b4b0c5f38f7d415430553f74279b (diff) | |
| parent | 944030aef7828911a38ed69d89709f778ca64d46 (diff) | |
| download | mariadb-git-c0a0543545bc7b3e2ce9aec787452e7bd619f3d3.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/union.result')
| -rw-r--r-- | mysql-test/r/union.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index d7e222f845e..9861b1bffeb 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 Extra 2 UNION t2 const PRIMARY PRIMARY 4 const 1 NULL UNION RESULT <union1,2> ALL 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 |