diff options
| author | bar@mysql.com <> | 2005-04-10 12:40:33 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-04-10 12:40:33 +0500 |
| commit | 16e186779f270bf9877938d20acdcebbee0d2e38 (patch) | |
| tree | 3c57e9853390c53423a48d67ecadc420c906c58b /mysql-test/t/union.test | |
| parent | aae638bbb29c91954fc887d942741ad1a8328ea9 (diff) | |
| download | mariadb-git-16e186779f270bf9877938d20acdcebbee0d2e38.tar.gz | |
ctype_collate.result, ctype_collate.test, union.result, union.test:
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
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 94cbd71c00c..b0446e1ea4a 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -641,7 +641,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 |