diff options
| author | unknown <bar@mysql.com> | 2005-04-11 15:11:52 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-04-11 15:11:52 +0500 |
| commit | b74783d56e67f80f2466dd715fc99393f8b7ed39 (patch) | |
| tree | 5ca97fe034800a82b6139eb23ea20d51dd9ac427 /mysql-test/t/union.test | |
| parent | 3a1cf28639eaf538c737e961bb3129e402f935da (diff) | |
| parent | ebdf2c0153c23b41442cacf4cdf78d499305a748 (diff) | |
| download | mariadb-git-b74783d56e67f80f2466dd715fc99393f8b7ed39.tar.gz | |
merge
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
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 |