Commit e4d99ba9 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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
parents a0c25203 99358698

mysql-test/include/ctype_innodb_like.inc

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#

# Bug#11650: LIKE pattern matching using prefix index

# doesn't return correct result

#

--disable_warnings

#

# This query creates a column using

# character_set_connection and

# collation_connection.

#

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

--enable_warnings

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



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

select collation(c1) from t1 limit 1;

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

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

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

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

drop table t1;

mysql-test/r/ctype_big5.result

+44 −0
Original line number Diff line number Diff line
@@ -67,6 +67,28 @@ big5_chinese_ci 6109 
big5_chinese_ci	61

big5_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)

big5_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='big5_bin';

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

delete from t1;
@@ -77,6 +99,28 @@ big5_bin 6109 
big5_bin	61

big5_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)

big5_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 big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('');

mysql-test/r/ctype_sjis.result

+44 −0
Original line number Diff line number Diff line
@@ -81,6 +81,28 @@ sjis_japanese_ci 6109 
sjis_japanese_ci	61

sjis_japanese_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)

sjis_japanese_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='sjis_bin';

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

delete from t1;
@@ -91,6 +113,28 @@ sjis_bin 6109 
sjis_bin	61

sjis_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)

sjis_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 sjis;

SELECT HEX('佐淘 \圭') FROM DUAL;

HEX('佐淘 ＼圭')

mysql-test/r/ctype_ujis.result

+44 −0
Original line number Diff line number Diff line
@@ -2217,6 +2217,28 @@ ujis_japanese_ci 6109 
ujis_japanese_ci	61

ujis_japanese_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)

ujis_japanese_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='ujis_bin';

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

delete from t1;
@@ -2227,3 +2249,25 @@ ujis_bin 6109 
ujis_bin	61

ujis_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)

ujis_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;

mysql-test/r/partition.result

+0 −266
Original line number Diff line number Diff line
@@ -87,269 +87,3 @@ partition by list (b*a) 
partition x2 values in (3, 11, 5, 7) tablespace ts2,

partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);

drop table t1;
 
partition by list (a)

partitions 3

(partition x1 values in (1,2,9,4) tablespace ts1,

partition x2 values in (3, 11, 5, 7) tablespace ts2,

partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);

ERROR 42000: Partitioning can not be used stand-alone in query near 'partition by list (a)

partitions 3

(partition x1 values in (1,2,9,4) tablespace ' at line 1

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by list (a)

partitions 2;

ERROR HY000: For LIST partitions each partition must be defined

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by list (sin(a))

partitions 3

(partition x1 values in (1,2,9,4) tablespace ts1,

partition x2 values in (3, 11, 5, 7) tablespace ts2,

partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);

ERROR HY000: The PARTITION function returns the wrong type

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by key (a+2)

partitions 3

(partition x1 tablespace ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+2)

partitions 3

(partition x1 tablespace ts1,

partition x2 tablespace ts2,

part' at line 6

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by key (a)

partitions 3

(partition tablespace ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3)' at line 8

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by key (a,d)

partitions 3

(partition x1 tablespace ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3);

ERROR HY000: Field in list of fields for partition function not found in table

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (a + d)

partitions 3

(partition x1 tablespace ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3);

ERROR 42S22: Unknown column 'd' in 'partition function'

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (sin(a))

partitions 3

(partition x1 tablespace ts1,

partition x2 tablespace ts2,

partition x3 tablespace ts3);

ERROR HY000: The PARTITION function returns the wrong type

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by key (a)

partitions 3

(partition x1, partition x2);

ERROR 42000: Wrong number of partitions defined, mismatch with previous setting near ')' at line 8

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (rand(a))

partitions 2

(partition x1, partition x2);

ERROR 42000: Constant/Random expression in (sub)partitioning function is not allowed near ')

partitions 2

(partition x1, partition x2)' at line 6

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by range (rand(a))

partitions 2

(partition x1 values less than (0), partition x2 values less than (2));

ERROR 42000: Constant/Random expression in (sub)partitioning function is not allowed near ')

partitions 2

(partition x1 values less than (0), partition x2 values less than' at line 6

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by list (rand(a))

partitions 2

(partition x1 values in (1), partition x2 values in (2));

ERROR 42000: Constant/Random expression in (sub)partitioning function is not allowed near ')

partitions 2

(partition x1 values in (1), partition x2 values in (2))' at line 6

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (a)

partitions 2

(partition x1 values less than (4),

partition x2 values less than (5));

ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition definition

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (a)

partitions 2

(partition x1 values in (4),

partition x2 values in (5));

ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key(a,b))

partition by hash (a)

partitions 2

(partition x1 values in (4,6),

partition x2 values in (5,7));

ERROR HY000: Only LIST PARTITIONING can use VALUES IN in partition definition

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by key (b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by key (a, b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by hash (a+b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by key (b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by key (a, b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by hash (a+b);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by hash (rand(a+b));

ERROR 42000: Constant/Random expression in (sub)partitioning function is not allowed near ')' at line 7

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by hash (sin(a+b))

(partition x1 (subpartition x11, subpartition x12),

partition x2 (subpartition x21, subpartition x22));

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by range (a)

subpartition by key (a+b)

(partition x1 values less than (1) (subpartition x11, subpartition x12),

partition x2 values less than (2) (subpartition x21, subpartition x22));

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '+b)

(partition x1 values less than (1) (subpartition x11, subpartition x12),

par' at line 7

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by range (a)

subpartition by key (a,d)

(partition x1 values less than (1) (subpartition x11, subpartition x12),

partition x2 values less than (2) (subpartition x21, subpartition x22));

ERROR HY000: Field in list of fields for partition function not found in table

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by key (a)

subpartition by hash (3+4);

ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning

CREATE TABLE t1 (

a int not null,

b int not null,

c int not null,

primary key (a,b))

partition by range (a)

subpartition by hash (a+d)

(partition x1 values less than (1) (subpartition x11, subpartition x12),

partition x2 values less than (2) (subpartition x21, subpartition x22));

ERROR 42S22: Unknown column 'd' in 'partition function'