diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-24 13:41:04 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-24 13:41:04 -0400 |
| commit | ed55bc9e6ab34102cbf064e496e2bb40ee79d0cc (patch) | |
| tree | 680280c0e4ac213352352b07c05d0e7107b6e337 /mysql-test/r/partition.result | |
| parent | a04d9fa947ec5fc22368c15d7c6c7ba47898405f (diff) | |
| parent | 301c7e0721a7ae1d53fce24706a933d3e5a01e10 (diff) | |
| download | mariadb-git-ed55bc9e6ab34102cbf064e496e2bb40ee79d0cc.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
sql/partition_info.cc:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/t/partition.test:
manual merge
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'mysql-test/r/partition.result')
| -rw-r--r-- | mysql-test/r/partition.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index a4dd5f9a64e..dbb3e0fdc52 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -890,6 +890,10 @@ s1 2 3 drop table t1; +create table t1 (a int) +partition by key (a) +(partition p0 engine = MERGE); +ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables create table t1 (a int) engine=memory partition by key(a); insert into t1 values (1); |