diff options
author | unknown <mikael/pappa@dator5.(none)> | 2006-08-17 09:32:13 -0400 |
---|---|---|
committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-17 09:32:13 -0400 |
commit | f56dd7f9f826ea51314816150b3e6b7754f53ed1 (patch) | |
tree | ffb7b49b364c71ad172a09a0bf4935d95928964a /mysql-test/r/partition.result | |
parent | f59dd3161b916534cf6e40eff9f08391ff152f51 (diff) | |
parent | a5b43381fe44144bb878b0084f5f811eebdaefb9 (diff) | |
download | mariadb-git-f56dd7f9f826ea51314816150b3e6b7754f53ed1.tar.gz |
Merge dator5.(none):/home/pappa/bug21350
into dator5.(none):/home/pappa/bug21388
sql/ha_partition.cc:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/t/partition.test:
manual merge
Diffstat (limited to 'mysql-test/r/partition.result')
-rw-r--r-- | mysql-test/r/partition.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index dbb0e20c246..94891f4f91f 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -42,6 +42,15 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I t1 InnoDB 10 Compact 8 2048 16384 0 0 0 9 NULL NULL NULL latin1_swedish_ci NULL partitioned drop table t1; create table t1 (a int) +partition by key (a) +(partition p0 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data'); +ERROR 42000: Incorrect table name 'part-data' +create table t1 (a int) +partition by key (a) +(partition p0, +partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data'); +ERROR 42000: Incorrect table name 'part-data' +create table t1 (a int) partition by list (a) (partition p0 values in (1)); create procedure pz() |