summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
diff options
context:
space:
mode:
authorunknown <pgalbraith/patg@govinda.patg.net>2006-08-15 09:02:53 -0700
committerunknown <pgalbraith/patg@govinda.patg.net>2006-08-15 09:02:53 -0700
commit1d3a13a95d730b8d1c9123aeeb886cee7513f80a (patch)
tree6675eb82317cc891e2c4b6a3d980a5ded521d332 /mysql-test/t/union.test
parentc372c94e745652548243371004deb1fb9392d960 (diff)
parent0c96f52f4e94470b668f7b7bf320c85cdac86622 (diff)
downloadmariadb-git-1d3a13a95d730b8d1c9123aeeb886cee7513f80a.tar.gz
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2 mysql-test/r/federated.result: Auto merged mysql-test/r/strict.result: Auto merged sql/sql_base.cc: Auto merged
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r--mysql-test/t/union.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index fdb5f968589..bf5c5e066f0 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -849,3 +849,10 @@ 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));
+#
+# Bug #16881: password() and union select
+# (The issue was poor handling of character set aggregation.)
+#
+select _utf8'12' union select _latin1'12345';
+
+--echo End of 5.0 tests