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 /sql | |
| 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 'sql')
| -rw-r--r-- | sql/item.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 3b87e5ee2cf..ffde92c4214 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -474,8 +474,17 @@ bool DTCollation::aggregate(DTCollation &dt, uint flags) set(0, DERIVATION_NONE); return 1; } + if (collation->state & MY_CS_BINSORT) + { + return 0; + } + else if (dt.collation->state & MY_CS_BINSORT) + { + set(dt); + return 0; + } CHARSET_INFO *bin= get_charset_by_csname(collation->csname, - MY_CS_BINSORT,MYF(0)); + MY_CS_BINSORT,MYF(0)); set(bin, DERIVATION_NONE); } } |