diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 22:41:48 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 22:41:48 -0400 |
| commit | 2ecd916de6f0daebb22f79cd6f0ad09f581c2aec (patch) | |
| tree | 454f08d5b72a20c64d94ea32579cca58eb4a33c8 /mysql-test | |
| parent | 4b639b6c58c2dacb449118e29fc480aca9a6fe48 (diff) | |
| parent | 6e53baebcbb501329f42b4c3db4212f40775ff31 (diff) | |
| download | mariadb-git-2ecd916de6f0daebb22f79cd6f0ad09f581c2aec.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/partition.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/partition_mgm.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/partition.test | 11 | ||||
| -rw-r--r-- | mysql-test/t/partition_mgm.test | 4 |
4 files changed, 18 insertions, 12 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 3753dc2fac5..025d9f46412 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -1,5 +1,10 @@ drop table if exists t1; create table t1 (a int) +engine = csv +partition by list (a) +(partition p0 values in (null)); +ERROR HY000: CSV handler cannot be used in partitioned tables +create table t1 (a int) partition by key(a) (partition p0 engine = MEMORY); drop table t1; diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index 7b7b5729112..48bbdf57b93 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -7,12 +7,6 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2 -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; Table Create Table @@ -20,7 +14,3 @@ t1 CREATE TABLE `t1` ( `f_date` date DEFAULT NULL, `f_varchar` varchar(30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1 -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD -/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm -/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 05adb6866db..a7f2e1c0b3e 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -9,6 +9,17 @@ drop table if exists t1; --enable_warnings +# +# Bug 19307: CSV engine crashes +# +--error ER_PARTITION_MERGE_ERROR +create table t1 (a int) +engine = csv +partition by list (a) +(partition p0 values in (null)); + +# +# create table t1 (a int) partition by key(a) (partition p0 engine = MEMORY); diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test index aa9a6459a1a..67c0619f28c 100644 --- a/mysql-test/t/partition_mgm.test +++ b/mysql-test/t/partition_mgm.test @@ -5,10 +5,10 @@ CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30)) PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2; SHOW CREATE TABLE t1; ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* +#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* ALTER TABLE t1 COALESCE PARTITION 1; SHOW CREATE TABLE t1; ---exec ls $MYSQLTEST_VARDIR/master-data/test/t1* +#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* |