summaryrefslogtreecommitdiff
path: root/mysql-test/r/compare.result
diff options
context:
space:
mode:
authorunknown <kaa@kaamos.(none)>2008-03-12 13:22:58 +0300
committerunknown <kaa@kaamos.(none)>2008-03-12 13:22:58 +0300
commitfe8463783f2ad711b559e5aea24efcc4fb0407b7 (patch)
tree0960ac96cd421283f8364c8cd4f8b5e40d5728de /mysql-test/r/compare.result
parent69d49bca8a075556e3647a55b721084e31ece4f2 (diff)
downloadmariadb-git-fe8463783f2ad711b559e5aea24efcc4fb0407b7.tar.gz
Post-merge fix.
Diffstat (limited to 'mysql-test/r/compare.result')
-rw-r--r--mysql-test/r/compare.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result
index b4e0dd6536d..44c258d7611 100644
--- a/mysql-test/r/compare.result
+++ b/mysql-test/r/compare.result
@@ -64,7 +64,7 @@ EXPLAIN EXTENDED SELECT b,c FROM t1 WHERE b = 1 AND CONCAT(b,c) = '0101';
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00 Using where
Warnings:
-Note 1003 select `test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`b` = 1) and (concat(_binary'01',`test`.`t1`.`c`) = _latin1'0101'))
+Note 1003 select `test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`b` = 1) and (concat('01',`test`.`t1`.`c`) = '0101'))
SELECT b,c FROM t1 WHERE b = 1 AND CONCAT(b,c) = '0101';
b c
01 01
@@ -88,6 +88,6 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
Warnings:
Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1
-Note 1003 select `test`.`t2`.`a` AS `a`,(select count(0) AS `COUNT(*)` from `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t2`.`a`) and (concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat(_latin1'0',`test`.`t2`.`a`,_latin1'01')))) AS `x` from `test`.`t2` order by `test`.`t2`.`a`
+Note 1003 select `test`.`t2`.`a` AS `a`,(select count(0) AS `COUNT(*)` from `test`.`t1` where ((`test`.`t1`.`b` = `test`.`t2`.`a`) and (concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat('0',`test`.`t2`.`a`,'01')))) AS `x` from `test`.`t2` order by `test`.`t2`.`a`
DROP TABLE t1,t2;
End of 5.0 tests