Commit 07487439 authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/home/mikael/bug16370
parents 890eca75 ac4219fa

mysql-test/r/backup.result

+11 −11
Original line number Diff line number Diff line
@@ -6,26 +6,26 @@ Table Op Msg_type Msg_text 
test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)

backup table t4 to '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	backup	status	OK

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

backup table t4 to '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)

drop table t4;

restore table t4 from '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	restore	status	OK

Warnings:

Warning	1540	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

select count(*) from t4;

count(*)

0
@@ -35,19 +35,19 @@ backup table t1 to '../tmp'; 
Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

drop table t1;

restore table t1 from '../bogus';

Table	Op	Msg_type	Msg_text

t1	restore	error	Failed copying .frm file

Warnings:

Warning	1540	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)

restore table t1 from '../tmp';

Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

Warnings:

Warning	1540	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

select n from t1;

n

23
@@ -62,7 +62,7 @@ Table Op Msg_type Msg_text 
test.t2	backup	status	OK

test.t3	backup	status	OK

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

drop table t1,t2,t3;

restore table t1,t2,t3 from '../tmp';

Table	Op	Msg_type	Msg_text
@@ -70,7 +70,7 @@ test.t1 restore status OK 
test.t2	restore	status	OK

test.t3	restore	status	OK

Warnings:

Warning	1540	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

select n from t1;

n

23
@@ -91,7 +91,7 @@ restore table t1 from '../tmp'; 
Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

Warnings:

Warning	1540	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

rename table t1 to t5;

lock tables t5 write;

backup table t5 to '../tmp';
@@ -99,5 +99,5 @@ unlock tables; 
Table	Op	Msg_type	Msg_text

test.t5	backup	status	OK

Warnings:

Warning	1540	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead.

drop table t5;

mysql-test/r/ndb_dd_ddl.result

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GROUP 
SHOW WARNINGS;

Level	Code	Message

Error	1296	Got error 1514 'Currently there is a limit of one logfile group' from NDB

Error	1506	Failed to create LOGFILE GROUP

Error	1507	Failed to create LOGFILE GROUP

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M

mysql-test/r/ndb_partition_key.result

+13 −0
Original line number Diff line number Diff line
@@ -89,3 +89,16 @@ ALTER TABLE t1 
PARTITION BY KEY(a)

(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB);

drop table t1;

CREATE TABLE t1 (

c1 MEDIUMINT NOT NULL AUTO_INCREMENT,

c2 TEXT NOT NULL,

c3 INT NOT NULL,

c4 BIT NOT NULL,

c5 FLOAT,

c6 VARCHAR(255),

c7 TIMESTAMP,

PRIMARY KEY(c1,c3))

ENGINE=NDB

PARTITION BY KEY(c3) PARTITIONS 5;

ALTER TABLE t1 COALESCE PARTITION 4;

DROP TABLE t1;

mysql-test/r/partition.result

+82 −0
Original line number Diff line number Diff line
@@ -428,6 +428,88 @@ partition by list (a) 
alter table t1 rebuild partition;

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 '' at line 1

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (5));

insert into t1 values (0);

ERROR HY000: Table has no partition for value 0

drop table t1;

create table t1 (a int)

partition by range (a) subpartition by hash (a)

(partition p0 values less than (100));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100) )

alter table t1 add partition (partition p1 values less than (200)

(subpartition subpart21));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p0 VALUES LESS THAN (100)  (SUBPARTITION p0sp0 ENGINE = MyISAM), PARTITION p1 VALUES LESS THAN (200)  (SUBPARTITION subpart21 ENGINE = MyISAM))

drop table t1;

create table t1 (a int)

partition by key (a);

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) 

alter table t1 add partition (partition p1);

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) (PARTITION p0  ENGINE = MyISAM, PARTITION p1  ENGINE = MyISAM)

drop table t1;

create table t1 (a int, b int)

partition by range (a)

subpartition by hash(a)

(partition p0 values less than (0) (subpartition sp0),

partition p1 values less than (1));

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

create table t1 (a int, b int)

partition by range (a)

subpartition by hash(a)

(partition p0 values less than (0),

partition p1 values less than (1) (subpartition sp0));

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

create table t1 (a int)

partition by hash (a)

(partition p0 (subpartition sp0));

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

create table t1 (a int)

partition by range (a)

(partition p0 values less than (1));

alter table t1 add partition (partition p1 values in (2));

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

alter table t1 add partition (partition p1);

ERROR HY000: RANGE PARTITIONING requires definition of VALUES LESS THAN for each partition

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));

alter table t1 add partition (partition p1 values less than (2));

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

alter table t1 add partition (partition p1);

ERROR HY000: LIST PARTITIONING requires definition of VALUES IN for each partition

drop table t1;

create table t1 (a int)

partition by hash (a)

(partition p0);

alter table t1 add partition (partition p1 values less than (2));

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

alter table t1 add partition (partition p1 values in (2));

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

drop table t1;

create table t1 (a int)

partition by list (a)

(partition p0 values in (1));

alter table t1 rebuild partition;

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 '' at line 1

drop table t1;

create table t1 (a int) engine=innodb partition by hash(a) ;

show table status like 't1';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

mysql-test/r/partition_mgm_err.result

+3 −1
Original line number Diff line number Diff line
@@ -141,7 +141,9 @@ DROP TABLE t1; 
CREATE TABLE t1 (a INT) PARTITION BY HASH(a);

ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

DROP TABLE t1;

CREATE TABLE t1 (s1 int, s2 int) PARTITION BY LIST (s1)  (

CREATE TABLE t1 (s1 int, s2 int)

PARTITION BY LIST (s1) 

SUBPARTITION BY KEY (s2) (

PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), 

PARTITION p2 VALUES IN (2) (SUBPARTITION p1b)

);