summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-11 15:00:06 -0400
committerunknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-04-11 15:00:06 -0400
commitee5e33148eaede439503ae43f2328b038f45d6e5 (patch)
tree3684b3770970436cf1e85de8f005dc925b25bbc7 /mysql-test
parent718d66e698f7644186af7f9f99308eadfc902603 (diff)
parent3649074e6d7b253507c4e198caa988fc03a1a795 (diff)
downloadmariadb-git-ee5e33148eaede439503ae43f2328b038f45d6e5.tar.gz
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/partition.result17
-rw-r--r--mysql-test/t/partition.test24
2 files changed, 41 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index ec8bbc16a41..e5b1d443f56 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -839,6 +839,23 @@ SHOW TABLE STATUS;
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
t1 MyISAM 10 Dynamic 0 0 0 0 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned
DROP TABLE t1;
+create table t1 (a int)
+partition by list (a)
+(partition `s1 s2` values in (0));
+drop table t1;
+create table t1 (a int)
+partition by list (a)
+(partition `7` values in (0));
+drop table t1;
+create table t1 (a int)
+partition by list (a)
+(partition `s1 s2 ` values in (0));
+ERROR HY000: Incorrect partition name
+create table t1 (a int)
+partition by list (a)
+subpartition by hash (a)
+(partition p1 values in (0) (subpartition `p1 p2 `));
+ERROR HY000: Incorrect partition name
CREATE TABLE t1 (a int)
PARTITION BY LIST (a)
(PARTITION p0 VALUES IN (NULL));
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index c3f1cc6da6d..536ab68a694 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -957,6 +957,30 @@ SHOW TABLE STATUS;
DROP TABLE t1;
#
+#BUG 18750 Problems with partition names
+#
+create table t1 (a int)
+partition by list (a)
+(partition `s1 s2` values in (0));
+drop table t1;
+
+create table t1 (a int)
+partition by list (a)
+(partition `7` values in (0));
+drop table t1;
+
+--error ER_WRONG_PARTITION_NAME
+create table t1 (a int)
+partition by list (a)
+(partition `s1 s2 ` values in (0));
+
+--error ER_WRONG_PARTITION_NAME
+create table t1 (a int)
+partition by list (a)
+subpartition by hash (a)
+(partition p1 values in (0) (subpartition `p1 p2 `));
+
+#
# BUG 18752 SHOW CREATE TABLE doesn't show NULL value in SHOW CREATE TABLE
#
CREATE TABLE t1 (a int)