diff options
| author | unknown <jimw@mysql.com> | 2006-02-15 11:39:54 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-15 11:39:54 -0800 |
| commit | 90717a3b1d84a4abf9d19d43910649d4a908c142 (patch) | |
| tree | a884535906f026d4f8314b77d926e08337c091cc /mysql-test/r/partition.result | |
| parent | 59f2e885cecd712e0832a7260e2f0f53853e1940 (diff) | |
| parent | 44a2ccc152f68a349a53fa65a7048258fc0b8cb9 (diff) | |
| download | mariadb-git-90717a3b1d84a4abf9d19d43910649d4a908c142.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
into mysql.com:/home/jimw/my/mysql-5.1-clean
sql/ha_partition.cc:
Auto merged
mysql-test/r/partition.result:
Resolve conflicts
mysql-test/t/partition.test:
Resolve conflicts
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 a6650871926..6b056dd3782 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -306,5 +306,9 @@ partition by range (f_int1) subpartition by hash (f_int1) (partition part1 values less than (1000) (subpartition subpart11 engine = memory)); set session storage_engine='myisam'; +create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1)) +partition by hash(f_int1) partitions 2; +insert into t1 values (1,1),(2,2); +replace into t1 values (1,1),(2,2); drop table t1; End of 5.1 tests |