mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fix a copy-paste error
LEX_CSTRING table_name= { table->s->db.str, table->s->table_name.length }; and misc cleanups
This commit is contained in:
@ -1,11 +1,6 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_partition.inc
|
||||
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS t1, t2, t3, t, tp, tsp, tmp;
|
||||
--enable_warnings
|
||||
|
||||
--enable_prepare_warnings
|
||||
--echo #
|
||||
--echo # Bug#11894100: EXCHANGE PARTITION CAN'T BE EXECUTED IF
|
||||
--echo # ROW_FORMAT WAS SET EXPLICITLY
|
||||
@ -14,7 +9,7 @@ DROP TABLE IF EXISTS t1, t2, t3, t, tp, tsp, tmp;
|
||||
--echo # Same definition (both have ROW_FORMAT set)
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT=COMPACT
|
||||
@ -46,7 +41,7 @@ DROP TABLE t2;
|
||||
--echo # Only the partitioned table have ROW_FORMAT set.
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB;
|
||||
@ -63,7 +58,7 @@ ORDER BY TABLE_NAME;
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB
|
||||
@ -71,7 +66,7 @@ PARTITION BY HASH (id)
|
||||
PARTITIONS 2;
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = COMPACT;
|
||||
@ -88,7 +83,7 @@ ORDER BY TABLE_NAME;
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB
|
||||
@ -96,7 +91,7 @@ PARTITION BY HASH (id)
|
||||
PARTITIONS 2;
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB;
|
||||
@ -113,7 +108,7 @@ ORDER BY TABLE_NAME;
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = REDUNDANT
|
||||
@ -121,7 +116,7 @@ PARTITION BY HASH (id)
|
||||
PARTITIONS 2;
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = REDUNDANT;
|
||||
@ -138,7 +133,7 @@ ORDER BY TABLE_NAME;
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB
|
||||
@ -146,7 +141,7 @@ PARTITION BY HASH (id)
|
||||
PARTITIONS 2;
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = REDUNDANT;
|
||||
@ -164,7 +159,7 @@ ORDER BY TABLE_NAME;
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = COMPACT
|
||||
@ -172,7 +167,7 @@ PARTITION BY HASH (id)
|
||||
PARTITIONS 2;
|
||||
CREATE TABLE t2 (
|
||||
id int(11) NOT NULL AUTO_INCREMENT,
|
||||
year year(2) DEFAULT NULL,
|
||||
year year DEFAULT NULL,
|
||||
modified timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE=InnoDB ROW_FORMAT = REDUNDANT;
|
||||
@ -537,4 +532,6 @@ ALTER TABLE t2 REMOVE PARTITIONING;
|
||||
ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2;
|
||||
DROP TABLE t1, t2;
|
||||
|
||||
--disable_prepare_warnings
|
||||
--echo #
|
||||
--echo # End of 10.3 tests
|
||||
--echo #
|
||||
|
Reference in New Issue
Block a user