diff options
author | unknown <bar@bar.myoffice.izhnet.ru> | 2008-03-06 08:41:05 +0400 |
---|---|---|
committer | unknown <bar@bar.myoffice.izhnet.ru> | 2008-03-06 08:41:05 +0400 |
commit | 89fb97c5009b802db74aa7d663c11ee9123ce8e3 (patch) | |
tree | 2c108a602bc2bf996ccede053955f079dddac09f /mysql-test/r/ctype_gbk.result | |
parent | 8e4a3fcbc996e41b4d805a926479bfacf13a99dd (diff) | |
parent | 272bb6b5856a7f033e6826ba5a96b1ca52aabb12 (diff) | |
download | mariadb-git-89fb97c5009b802db74aa7d663c11ee9123ce8e3.tar.gz |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580
into mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/include/ctype_common.inc:
after merge fix
mysql-test/r/ctype_big5.result:
after merge fix
mysql-test/r/ctype_euckr.result:
after merge fix
mysql-test/r/ctype_gb2312.result:
after merge fix
mysql-test/r/ctype_gbk.result:
after merge fix
mysql-test/r/ctype_uca.result:
after merge fix
Diffstat (limited to 'mysql-test/r/ctype_gbk.result')
-rw-r--r-- | mysql-test/r/ctype_gbk.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_gbk.result b/mysql-test/r/ctype_gbk.result index 8437e34be1e..b28ff761238 100644 --- a/mysql-test/r/ctype_gbk.result +++ b/mysql-test/r/ctype_gbk.result @@ -3,6 +3,8 @@ SET @test_character_set= 'gbk'; SET @test_collation= 'gbk_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=gbk +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 gbk; SET collation_connection='gbk_chinese_ci'; create table t1 select repeat('a',4000) a; |