Commit 96f83a0d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
parents 03fcc48e 6d16282f

mysql-test/r/merge.result

+6 −0
Original line number Diff line number Diff line
@@ -779,3 +779,9 @@ insert into t1 values ("Monty"),("WAX"),("Walrus"); 
alter table t1 engine=MERGE;

ERROR HY000: Table storage engine for 't1' doesn't have this option

drop table t1;

create table t1 (b bit(1));

create table t2 (b bit(1));

create table tm (b bit(1)) engine = merge union = (t1,t2);

select * from tm;

b

drop table tm, t1, t2;

mysql-test/r/partition_error.result

+24 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a int)

engine = x

partition by key (a);

Warnings:

Error	1286	Unknown table engine 'x'

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY (a) 

drop table t1;

create table t1 (a int)

engine = innodb

partition by list (a)

(partition p0 values in (0));

alter table t1 engine = x;

Warnings:

Error	1286	Unknown table engine 'x'

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (0) ENGINE = InnoDB)

drop table t1;

partition by list (a)

partitions 3

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

mysql-test/t/lock_multi.test

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ use test; 
#

connection default;



# End of 5.0 tests

#

# Bug#19815 - CREATE/RENAME/DROP DATABASE can deadlock on a global read lock

#

connect (con1,localhost,root,,);
@@ -191,3 +191,4 @@ disconnect con2; 
--error ER_DB_DROP_EXISTS

DROP DATABASE mysqltest_1;



# End of 5.0 tests

mysql-test/t/merge.test

+9 −0
Original line number Diff line number Diff line
@@ -393,4 +393,13 @@ insert into t1 values ("Monty"),("WAX"),("Walrus"); 
alter table t1 engine=MERGE;

drop table t1;



#

# BUG#19648 - Merge table does not work with bit types

#

create table t1 (b bit(1));

create table t2 (b bit(1));

create table tm (b bit(1)) engine = merge union = (t1,t2);

select * from tm;

drop table tm, t1, t2;



# End of 5.0 tests

mysql-test/t/partition_error.test

+20 −0
Original line number Diff line number Diff line
@@ -8,6 +8,24 @@ 
drop table if exists t1;

--enable_warnings



#

# Bug 20397: Partitions: Crash when using non-existing engine

#

create table t1 (a int)

engine = x

partition by key (a);

show create table t1;

drop table t1;



create table t1 (a int)

engine = innodb

partition by list (a)

(partition p0 values in (0));



alter table t1 engine = x;

show create table t1;

drop table t1;



#

# Partition by key stand-alone error

#
@@ -779,3 +797,5 @@ partition by range (a + (select count(*) from t1)) 
-- error ER_PARTITION_FUNC_NOT_ALLOWED_ERROR

create table t1 (a char(10))

partition by hash (extractvalue(a,'a'));