diff options
author | unknown <istruewing@stella.local> | 2008-03-26 09:33:55 +0100 |
---|---|---|
committer | unknown <istruewing@stella.local> | 2008-03-26 09:33:55 +0100 |
commit | 0d6f9bad705cc24d259be0dbb480c8a2b3fe89a5 (patch) | |
tree | 9e49dc365cd12b2b683b2ee916710fbeeb67f31c /mysql-test/r/ctype_gbk.result | |
parent | 4097ee7ffa2f8eea143977a2238b016a1c99b3ca (diff) | |
parent | 0cb21ac297cd5fd8d933224272e9534ecd22f3c4 (diff) | |
download | mariadb-git-0d6f9bad705cc24d259be0dbb480c8a2b3fe89a5.tar.gz |
Merge stella.local:/home2/mydev/mysql-5.0-amain
into stella.local:/home2/mydev/mysql-5.0-axmrg
mysql-test/r/ctype_big5.result:
Auto merged
mysql-test/r/ctype_cp932.result:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_gb2312.result:
Auto merged
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/slave.cc:
Auto merged
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 0a326c3bf65..6066246a2ef 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; |