summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@macbook.gmz>2006-09-05 19:07:55 +0300
committerunknown <gkodinov/kgeorge@macbook.gmz>2006-09-05 19:07:55 +0300
commit3a8cdfc3ed8bdd814ef88b44209b6ce9f4d09f0f (patch)
tree090421cb6b129d20f6d0f733cc8b18b853a26481 /mysql-test/r/union.result
parent2aeec864e29066c8cf42664da37a77bd601767de (diff)
downloadmariadb-git-3a8cdfc3ed8bdd814ef88b44209b6ce9f4d09f0f.tar.gz
Merge bug #16792 4.1->5.0
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 42a3874db08..12463658bf9 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1365,7 +1365,7 @@ drop table t1, t2;
(select avg(1)) union (select avg(1)) union (select avg(1)) union
(select avg(1)) union (select avg(1)) union (select avg(1));
avg(1)
-NULL
+1.0000
select _utf8'12' union select _latin1'12345';
12
12