Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580 (34da9303) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/include/ctype_common.inc

+16 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@

		SET @safe_character_set_server= @@character_set_server;
		SET @safe_collation_server= @@collation_server;
		SET @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		SET character_set_server= @test_character_set;
		SET collation_server= @test_collation;
		CREATE DATABASE d1;
		@@ -62,8 +64,22 @@ select a sounds like a from t1;
		select 1 from t1 order by cast(a as char(1));
		drop table t1;

		#
		# Bug#27580 SPACE() function collation bug?
		#
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		drop table t1;

		DROP DATABASE d1;
		# Restore settings
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;

mysql-test/r/ctype_big5.result

+19 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ 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 @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		SET character_set_server= @test_character_set;
		SET collation_server= @test_collation;
		CREATE DATABASE d1;
		@@ -69,10 +71,27 @@ select 1 from t1 order by cast(a as char(1));
		1
		1
		drop table t1;
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`name` varchar(10) default NULL,
		`level` smallint(5) unsigned default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=big5
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		concat(name,space(level)) concat(name, repeat(' ',level))
		string string
		drop table t1;
		DROP DATABASE d1;
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;
		SET NAMES big5;
		SET collation_connection='big5_chinese_ci';
		create table t1 select repeat('a',4000) a;

mysql-test/r/ctype_cp1250_ch.result

+152 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,158 @@ DROP TABLE IF EXISTS t1;
		SHOW COLLATION LIKE 'cp1250_czech_cs';
		Collation Charset Id Default Compiled Sortlen
		cp1250_czech_cs cp1250 34 Yes 2
		SET @test_character_set= 'cp1250';
		SET @test_collation= 'cp1250_general_ci';
		SET @safe_character_set_server= @@character_set_server;
		SET @safe_collation_server= @@collation_server;
		SET @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		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) cp1250_general_ci YES MUL NULL
		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) cp1250_general_ci YES MUL NULL
		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;
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`name` varchar(10) default NULL,
		`level` smallint(5) unsigned default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=cp1250
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		concat(name,space(level)) concat(name, repeat(' ',level))
		string string
		drop table t1;
		DROP DATABASE d1;
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;
		SET @test_character_set= 'cp1250';
		SET @test_collation= 'cp1250_czech_cs';
		SET @safe_character_set_server= @@character_set_server;
		SET @safe_collation_server= @@collation_server;
		SET @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		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) cp1250_czech_cs YES MUL NULL
		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) cp1250_czech_cs YES MUL NULL
		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;
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`name` varchar(10) collate cp1250_czech_cs default NULL,
		`level` smallint(5) unsigned default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		concat(name,space(level)) concat(name, repeat(' ',level))
		string string
		drop table t1;
		DROP DATABASE d1;
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;
		CREATE TABLE t1 (a char(16)) character set cp1250 collate cp1250_czech_cs;
		INSERT INTO t1 VALUES ('');
		SELECT a, length(a), a='', a=' ', a=' ' FROM t1;

mysql-test/r/ctype_euckr.result

+19 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ SET @test_character_set= 'euckr';
		SET @test_collation= 'euckr_korean_ci';
		SET @safe_character_set_server= @@character_set_server;
		SET @safe_collation_server= @@collation_server;
		SET @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		SET character_set_server= @test_character_set;
		SET collation_server= @test_collation;
		CREATE DATABASE d1;
		@@ -69,10 +71,27 @@ select 1 from t1 order by cast(a as char(1));
		1
		1
		drop table t1;
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`name` varchar(10) default NULL,
		`level` smallint(5) unsigned default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=euckr
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		concat(name,space(level)) concat(name, repeat(' ',level))
		string string
		drop table t1;
		DROP DATABASE d1;
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;
		SET NAMES euckr;
		SET collation_connection='euckr_korean_ci';
		create table t1 select repeat('a',4000) a;

mysql-test/r/ctype_gb2312.result

+19 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ SET @test_character_set= 'gb2312';
		SET @test_collation= 'gb2312_chinese_ci';
		SET @safe_character_set_server= @@character_set_server;
		SET @safe_collation_server= @@collation_server;
		SET @safe_character_set_client= @@character_set_client;
		SET @safe_character_set_results= @@character_set_results;
		SET character_set_server= @test_character_set;
		SET collation_server= @test_collation;
		CREATE DATABASE d1;
		@@ -69,10 +71,27 @@ select 1 from t1 order by cast(a as char(1));
		1
		1
		drop table t1;
		set names utf8;
		create table t1 (
		name varchar(10),
		level smallint unsigned);
		show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`name` varchar(10) default NULL,
		`level` smallint(5) unsigned default NULL
		) ENGINE=MyISAM DEFAULT CHARSET=gb2312
		insert into t1 values ('string',1);
		select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
		concat(name,space(level)) concat(name, repeat(' ',level))
		string string
		drop table t1;
		DROP DATABASE d1;
		USE test;
		SET character_set_server= @safe_character_set_server;
		SET collation_server= @safe_collation_server;
		SET character_set_client= @safe_character_set_client;
		SET character_set_results= @safe_character_set_results;
		SET NAMES gb2312;
		SET collation_connection='gb2312_chinese_ci';
		create table t1 select repeat('a',4000) a;