database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

ctype_collate.result, ctype_collate.test, union.result, union.test:

Browse Source 
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
This commit is contained in:
unknown
2005-04-10 12:40:33 +05:00
parent f2824c4d60
commit ebdf2c0153
5 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/ctype_collate.result
View File

@ -535,6 +535,19 @@ s2 CHAR(5) COLLATE latin1_swedish_ci);
SELECT * FROM t1 WHERE s1 = s2;
ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation '='
DROP TABLE t1;
CREATE TABLE t1
(s1 CHAR(5) COLLATE latin1_german1_ci,
s2 CHAR(5) COLLATE latin1_swedish_ci,
s3 CHAR(5) COLLATE latin1_bin);
INSERT INTO t1 VALUES ('a','A','A');
SELECT * FROM t1 WHERE s1 = s2;
ERROR HY000: Illegal mix of collations (latin1_german1_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation '='
SELECT * FROM t1 WHERE s1 = s3;
s1 s2 s3
SELECT * FROM t1 WHERE s2 = s3;
s1 s2 s3
a A A
DROP TABLE t1;
SET NAMES latin1;
CREATE TABLE t1
(s1 char(10) COLLATE latin1_german1_ci,

2
mysql-test/r/union.result
View File

@ -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);