Commit f89b4dce authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 83f39bee 9e971596

mysql-test/include/ctype_common.inc

0 → 100644
+56 −0
Original line number Diff line number Diff line 
#

# Common tests for all character sets and collations.

# Include this file from a test with @test_characrer_set

# and @test_collation set to desired values.

#

# Please don't use SHOW CREATE TABLE in this file,

# we want it to be HANDLER independent. You can

# use SHOW FULL COLUMNS instead.

#

# Please surround all CREATE TABLE with --disable_warnings

# and --enable_warnings to be able to set storage_engine

# without having to check if the hanlder exists.



SET @safe_character_set_server= @@character_set_server;

SET @safe_collation_server= @@collation_server;

SET character_set_server= @test_character_set;

SET collation_server= @test_collation;

CREATE DATABASE d1;

USE d1;



#

# Bug 1883: LIKE did not work in some cases with a key.

#

--disable_warnings

CREATE TABLE t1 (c CHAR(10), KEY(c));

--enable_warnings

# check the column was created with the expected charset/collation

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

DROP TABLE t1;



#

# Bug 6643 incorrect response with partial utf8 index

#

--disable_warnings

CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

--enable_warnings

# check the column was created with the expected charset/collation

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

SELECT c1 as want3results from t1 where c1 like 'lo%';

SELECT c1 as want1result  from t1 where c1 like 'loc%';

SELECT c1 as want1result  from t1 where c1 like 'loca%';

SELECT c1 as want1result  from t1 where c1 like 'locat%';

SELECT c1 as want1result  from t1 where c1 like 'locati%';

SELECT c1 as want1result  from t1 where c1 like 'locatio%';

SELECT c1 as want1result  from t1 where c1 like 'location%';

DROP TABLE t1;



DROP DATABASE d1;

# Restore settings

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

mysql-test/r/ctype_big5.result

+52 −4
Original line number Diff line number Diff line 
drop table if exists t1;

SET NAMES big5;

CREATE TABLE t1 (c CHAR(10) CHARACTER SET big5, KEY(c));

SET @test_character_set= 'big5';

SET @test_collation= 'big5_chinese_ci';

SET @safe_character_set_server= @@character_set_server;

SET @safe_collation_server= @@collation_server;

SET character_set_server= @test_character_set;

SET collation_server= @test_collation;

CREATE DATABASE d1;

USE d1;

CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT * FROM t1 WHERE c LIKE 'aaa%';

c

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results

aaa

aaaa

aaaaa

DROP TABLE t1;

CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

location

loberge

lotre

SELECT c1 as want3results from t1 where c1 like 'lo%';

want3results

location

loberge

lotre

SELECT c1 as want1result  from t1 where c1 like 'loc%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'loca%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locat%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locati%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locatio%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'location%';

want1result

location

DROP TABLE t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

mysql-test/r/ctype_uca.result

+57 −0
Original line number Diff line number Diff line
@@ -2315,3 +2315,60 @@ HEX(CONVERT(col1 USING ucs2)) 
064A06A9062F064A06AF0631

064A06A9064A

DROP TABLE t1;

SET @test_character_set= 'utf8';

SET @test_collation= 'utf8_swedish_ci';

SET @safe_character_set_server= @@character_set_server;

SET @safe_collation_server= @@collation_server;

SET character_set_server= @test_character_set;

SET collation_server= @test_collation;

CREATE DATABASE d1;

USE d1;

CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results

aaa

aaaa

aaaaa

DROP TABLE t1;

CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

location

loberge

lotre

SELECT c1 as want3results from t1 where c1 like 'lo%';

want3results

location

loberge

lotre

SELECT c1 as want1result  from t1 where c1 like 'loc%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'loca%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locat%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locati%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locatio%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'location%';

want1result

location

DROP TABLE t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

mysql-test/t/ctype_big5.test

+3 −9
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ 
drop table if exists t1;

--enable_warnings



SET NAMES big5;



#

# Bug 1883: LIKE did not work in some cases with a key.

#

CREATE TABLE t1 (c CHAR(10) CHARACTER SET big5, KEY(c));

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT * FROM t1 WHERE c LIKE 'aaa%';

DROP TABLE t1;
 
SET @test_character_set= 'big5';

SET @test_collation= 'big5_chinese_ci';

-- source include/ctype_common.inc

mysql-test/t/ctype_uca.test

+4 −0
Original line number Diff line number Diff line
@@ -435,3 +435,7 @@ INSERT INTO t1 VALUES (CONVERT(_ucs2 0x06280648062F0646062F USING utf8)); 
INSERT INTO t1 VALUES (CONVERT(_ucs2 0x06450647064506270646 USING utf8));

SELECT HEX(CONVERT(col1 USING ucs2)) FROM t1 ORDER BY col1 COLLATE utf8_persian_ci, col1 COLLATE utf8_bin;

DROP TABLE t1;



SET @test_character_set= 'utf8';

SET @test_collation= 'utf8_swedish_ci';

-- source include/ctype_common.inc