diff options
| author | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
| commit | 8354916f2c74fc3ff71bad4b9a3cf011f959eae0 (patch) | |
| tree | 5688018d1c55ec2c3e437747634fd4fe63bd4f4e /mysql-test/r/union.result | |
| parent | 8b3468ce79ed061f12df94f4a42e2c5b48087310 (diff) | |
| parent | 1625806ef1f7f6658001ee98ebb2af8ef5d6872b (diff) | |
| download | mariadb-git-8354916f2c74fc3ff71bad4b9a3cf011f959eae0.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
mysql-test/r/explain.result:
Auto merged
mysql-test/r/func_default.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/having.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/varbinary.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/func_str.result:
Manually merged
mysql-test/t/func_str.test:
Manually 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 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 |