Commit 0eea2a12 authored by unknown's avatar unknown
Browse files

Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
parents 53118f40 478e6f29

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ inline double ulonglong2double(ulonglong value) 
			   *(((long *) T)+1) = *(((long*) &V)+1); }

#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }

#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))

#define floatget(V,M)   memcpy((byte*)(&V), (byte*)(M), sizeof(float))

#define float8get(V,M) doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define float8store(V,M) doublestore((V),(M))

mysql-test/include/have_gbk.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_gbk.require

disable_query_log;

show collation like "gbk_chinese_ci";

enable_query_log;

mysql-test/r/create.result

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Note 1051 Unknown table 't1' 
create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;

ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key

create table not_existing_database.test (a int);

Got one of the listed errors

ERROR 42000: Unknown database 'not_existing_database'

create table `a/a` (a int);

ERROR 42000: Incorrect table name 'a/a'

create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
@@ -358,7 +358,7 @@ create table t3 like t1; 
create table t3 like mysqltest.t3;

ERROR 42S01: Table 't3' already exists

create table non_existing_database.t1 like t1;

Got one of the listed errors

ERROR 42000: Unknown database 'non_existing_database'

create table t3 like non_existing_table;

ERROR 42S02: Unknown table 'non_existing_table'

create temporary table t3 like t1;

mysql-test/r/ctype_gbk.result

0 → 100644
+131 −0
Original line number Diff line number Diff line 
drop table if exists t1;

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 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)	gbk_chinese_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)	gbk_chinese_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;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

SET NAMES gbk;

SET collation_connection='gbk_chinese_ci';

create table t1 select repeat('a',4000) a;

delete from t1;

insert into t1 values ('a'), ('a '), ('a\t');

select collation(a),hex(a) from t1 order by a;

collation(a)	hex(a)

gbk_chinese_ci	6109

gbk_chinese_ci	61

gbk_chinese_ci	6120

drop table t1;

create table t1 engine=innodb select repeat('a',50) as c1;

alter table t1 add index(c1(5));

insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');

select collation(c1) from t1 limit 1;

collation(c1)

gbk_chinese_ci

select c1 from t1 where c1 like 'abcdef%' order by c1;

c1

abcdefg

select c1 from t1 where c1 like 'abcde1%' order by c1;

c1

abcde100

abcde110

abcde111

select c1 from t1 where c1 like 'abcde11%' order by c1;

c1

abcde110

abcde111

select c1 from t1 where c1 like 'abcde111%' order by c1;

c1

abcde111

drop table t1;

SET collation_connection='gbk_bin';

create table t1 select repeat('a',4000) a;

delete from t1;

insert into t1 values ('a'), ('a '), ('a\t');

select collation(a),hex(a) from t1 order by a;

collation(a)	hex(a)

gbk_bin	6109

gbk_bin	61

gbk_bin	6120

drop table t1;

create table t1 engine=innodb select repeat('a',50) as c1;

alter table t1 add index(c1(5));

insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');

select collation(c1) from t1 limit 1;

collation(c1)

gbk_bin

select c1 from t1 where c1 like 'abcdef%' order by c1;

c1

abcdefg

select c1 from t1 where c1 like 'abcde1%' order by c1;

c1

abcde100

abcde110

abcde111

select c1 from t1 where c1 like 'abcde11%' order by c1;

c1

abcde110

abcde111

select c1 from t1 where c1 like 'abcde111%' order by c1;

c1

abcde111

drop table t1;

SET NAMES gbk;

CREATE TABLE t1 (a text) character set gbk;

INSERT INTO t1 VALUES (0xA3A0),(0xA1A1);

SELECT hex(a) FROM t1 ORDER BY a;

hex(a)

A1A1

A3A0

DROP TABLE t1;

mysql-test/r/func_str.result

+15 −0
Original line number Diff line number Diff line
@@ -879,3 +879,18 @@ drop table t1; 
select hex(29223372036854775809), hex(-29223372036854775809);

hex(29223372036854775809)	hex(-29223372036854775809)

FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF

create table t1 (i int);

insert into t1 values (1000000000),(1);

select lpad(i, 7, ' ') as t from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					t	253	7	7	Y	128	31	63

t

1000000

      1

select rpad(i, 7, ' ') as t from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					t	253	7	7	Y	128	31	63

t

1000000

1      

drop table t1;