Commit d7f497cc authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
parents 2385ae97 bc2776d9

BitKeeper/etc/config

+5 −0
Original line number Diff line number Diff line
@@ -73,3 +73,8 @@ hours: 
[nick:]checkout:get

checkout:edit

eoln:unix



license: BKL5433d4e6925a06a150001200fff9b

licsign1: YgAAAo0AAAADgAAAAEYUtZil1XCmH6z+LTlQMDJ+1ZeBLIgtHo1azUxQ8/8G1JuW

licsign2: fxW3y9raSlpYVAleJSaBDKYiVtEuSdaUN2ILLo6Wc8TJmLl0aprUy7Lh/m/Sq/YC

licsign3: 0H7qah3bdItuw7NGNSLfBzigbKOF6kPbU84VlAUhOqLR2e5Zf32SBZhtCYGA

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/alter_table.result

+54 −0
Original line number Diff line number Diff line
@@ -537,3 +537,57 @@ create table t1 ( a timestamp ); 
alter table t1 add unique ( a(1) );

ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys

drop table t1;

create table t1 (v varchar(32));

insert into t1 values ('def'),('abc'),('hij'),('3r4f');

select * from t1;

v

def

abc

hij

3r4f

alter table t1 change v v2 varchar(32);

select * from t1;

v2

def

abc

hij

3r4f

alter table t1 change v2 v varchar(64);

select * from t1;

v

def

abc

hij

3r4f

update t1 set v = 'lmn' where v = 'hij';

select * from t1;

v

def

abc

lmn

3r4f

alter table t1 add i int auto_increment not null primary key first;

select * from t1;

i	v

1	def

2	abc

3	lmn

4	3r4f

update t1 set i=5 where i=3;

select * from t1;

i	v

1	def

2	abc

5	lmn

4	3r4f

alter table t1 change i i bigint;

select * from t1;

i	v

1	def

2	abc

5	lmn

4	3r4f

alter table t1 add unique key (i, v);

select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn');

i	v

4	3r4f

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/have_gbk.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Collation	Charset	Id	Default	Compiled	Sortlen

gbk_chinese_ci	gbk	28	Yes	Yes	1