diff options
author | bar@mysql.com <> | 2005-04-11 15:11:52 +0500 |
---|---|---|
committer | bar@mysql.com <> | 2005-04-11 15:11:52 +0500 |
commit | 71f530c4eac384cd408941416c31518b8f1bd59d (patch) | |
tree | 5ca97fe034800a82b6139eb23ea20d51dd9ac427 /mysql-test/t/union.test | |
parent | fc0e6aa274c876fac17705d37b6d802f0e7d02e0 (diff) | |
parent | 16e186779f270bf9877938d20acdcebbee0d2e38 (diff) | |
download | mariadb-git-71f530c4eac384cd408941416c31518b8f1bd59d.tar.gz |
merge
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r-- | mysql-test/t/union.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index 7d3f52bd7ae..239a7aaad4b 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -659,7 +659,7 @@ drop table t1; create table t2 ( a char character set latin1 collate latin1_swedish_ci, -b char character set latin1 collate latin1_bin); +b char character set latin1 collate latin1_german1_ci); --error 1271 create table t1 as (select a from t2) union |