diff options
| author | unknown <bar@mysql.com> | 2005-04-10 12:40:33 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-04-10 12:40:33 +0500 |
| commit | ebdf2c0153c23b41442cacf4cdf78d499305a748 (patch) | |
| tree | 3c57e9853390c53423a48d67ecadc420c906c58b /mysql-test/r/union.result | |
| parent | f2824c4d6066c8b0759eaba06a7010232a3baa55 (diff) | |
| download | mariadb-git-ebdf2c0153c23b41442cacf4cdf78d499305a748.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.
sql/item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
fixing tests accordingly
mysql-test/r/union.result:
fixing tests accordingly
mysql-test/t/ctype_collate.test:
fixing tests accordingly
mysql-test/r/ctype_collate.result:
fixing tests accordingly
Diffstat (limited to 'mysql-test/r/union.result')
| -rw-r--r-- | mysql-test/r/union.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 96baf36d151..c140ecd26e1 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1103,7 +1103,7 @@ count(*) 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); create table t1 as (select a from t2) union (select b from t2); |