1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines

Browse Source 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
This commit is contained in:
unknown 2008-03-07 14:07:01 -08:00
commit 1bffc51066
8 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/ctype_cp1250_ch.result
View File

@ -82,8 +82,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=cp1250 ) ENGINE=MyISAM DEFAULT CHARSET=cp1250
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;
@ -175,8 +175,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) collate cp1250_czech_cs default NULL, `name` varchar(10) COLLATE cp1250_czech_cs DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs ) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_czech_cs
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

4
mysql-test/r/ctype_euckr.result
View File

@ -78,8 +78,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=euckr ) ENGINE=MyISAM DEFAULT CHARSET=euckr
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

4
mysql-test/r/ctype_gb2312.result
View File

@ -78,8 +78,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=gb2312 ) ENGINE=MyISAM DEFAULT CHARSET=gb2312
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

4
mysql-test/r/ctype_gbk.result
View File

@ -78,8 +78,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=gbk ) ENGINE=MyISAM DEFAULT CHARSET=gbk
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

4
mysql-test/r/ctype_uca.result
View File

@ -2613,8 +2613,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) collate utf8_swedish_ci default NULL, `name` varchar(10) COLLATE utf8_swedish_ci DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

4
mysql-test/r/ctype_ucs.result
View File

@ -78,8 +78,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=ucs2 ) ENGINE=MyISAM DEFAULT CHARSET=ucs2
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;

19
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
View File

@ -6,6 +6,8 @@ SET @test_character_set= 'cp932';
SET @test_collation= 'cp932_japanese_ci'; SET @test_collation= 'cp932_japanese_ci';
SET @safe_character_set_server= @@character_set_server; SET @safe_character_set_server= @@character_set_server;
SET @safe_collation_server= @@collation_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 character_set_server= @test_character_set;
SET collation_server= @test_collation; SET collation_server= @test_collation;
CREATE DATABASE d1; CREATE DATABASE d1;
@ -72,10 +74,27 @@ select 1 from t1 order by cast(a as char(1));
1 1
1 1
drop table t1; 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=cp932
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; DROP DATABASE d1;
USE test; USE test;
SET character_set_server= @safe_character_set_server; SET character_set_server= @safe_character_set_server;
SET collation_server= @safe_collation_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 cp932; set names cp932;
set character_set_database = cp932; set character_set_database = cp932;
CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = cp932; CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = cp932;

4
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
View File

@ -81,8 +81,8 @@ level smallint unsigned);
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`name` varchar(10) default NULL, `name` varchar(10) DEFAULT NULL,
`level` smallint(5) unsigned default NULL `level` smallint(5) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=cp932 ) ENGINE=MyISAM DEFAULT CHARSET=cp932
insert into t1 values ('string',1); insert into t1 values ('string',1);
select concat(name,space(level)), concat(name, repeat(' ',level)) from t1; select concat(name,space(level)), concat(name, repeat(' ',level)) from t1;