diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-10-28 18:22:36 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-10-28 18:22:36 +0100 |
| commit | 072c13d9395b6a3f3a472633d6e817db9215d81e (patch) | |
| tree | 0891f6df26609fa66b89a4cc8faa8079ec21f6f3 /mysql-test/suite/parts/inc | |
| parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
| parent | 10fed1aca0096acb135c2065233e84d61b00b9cf (diff) | |
| download | mariadb-git-072c13d9395b6a3f3a472633d6e817db9215d81e.tar.gz | |
Merged WL#3352 into mysql-next-mr
Diffstat (limited to 'mysql-test/suite/parts/inc')
| -rw-r--r-- | mysql-test/suite/parts/inc/partition_key_32col.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/parts/inc/partition_syntax.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/parts/inc/partition_key_32col.inc b/mysql-test/suite/parts/inc/partition_key_32col.inc index 74016d9b556..b0635ca0e9c 100644 --- a/mysql-test/suite/parts/inc/partition_key_32col.inc +++ b/mysql-test/suite/parts/inc/partition_key_32col.inc @@ -1,4 +1,4 @@ ---error ER_TOO_MANY_KEY_PARTS +--error ER_TOO_MANY_PARTITION_FUNC_FIELDS_ERROR eval create table t1 (a date not null, b varchar(50) not null, c varchar(50) not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1 decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2 tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null, g3 bigint not null, h3 tinyint not null, i char(255), primary key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)) engine=$engine partition by key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3) ( partition pa1 max_rows=20 min_rows=2, diff --git a/mysql-test/suite/parts/inc/partition_syntax.inc b/mysql-test/suite/parts/inc/partition_syntax.inc index e72aad80f0a..e7eea73325a 100644 --- a/mysql-test/suite/parts/inc/partition_syntax.inc +++ b/mysql-test/suite/parts/inc/partition_syntax.inc @@ -312,7 +312,7 @@ PARTITION BY RANGE(f_int1) --echo #------------------------------------------------------------------------ --echo # 3.5.1 NULL in RANGE partitioning clause --echo # 3.5.1.1 VALUE LESS THAN (NULL) is not allowed ---error ER_PARSE_ERROR +--error ER_NULL_IN_VALUES_LESS_THAN eval CREATE TABLE t1 ( $column_list ) @@ -320,7 +320,7 @@ PARTITION BY RANGE(f_int1) ( PARTITION part1 VALUES LESS THAN (NULL), PARTITION part2 VALUES LESS THAN (1000)); --echo # 3.5.1.2 VALUE LESS THAN (NULL) is not allowed ---error ER_PARSE_ERROR +--error ER_NULL_IN_VALUES_LESS_THAN eval CREATE TABLE t1 ( $column_list ) |