diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 12:37:53 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-03 12:37:53 +0400 |
| commit | 3678231d5a57e9d36056b75cc29023a376a3cb75 (patch) | |
| tree | 2e84ff7f9e6dcd233caa9e22272a48ae20c5209a /mysql-test/r/partition.result | |
| parent | 5a59d706be5f38768fc861388d92c0f985a5fa1a (diff) | |
| parent | 3569fe776fbaf0a750b054b0684d37d7cefeaa94 (diff) | |
| download | mariadb-git-3678231d5a57e9d36056b75cc29023a376a3cb75.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/partition.result
Text conflict in mysql-test/t/partition.test
Text conflict in storage/myisam/mi_dynrec.c
Diffstat (limited to 'mysql-test/r/partition.result')
| -rw-r--r-- | mysql-test/r/partition.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index 9aa2dd418f8..05754f251a8 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -2111,4 +2111,15 @@ COUNT(*) 0 DROP TABLE t1; SET SESSION SQL_MODE=DEFAULT; +# +# BUG#51868 - crash with myisam_use_mmap and partitioned myisam tables +# +SET GLOBAL myisam_use_mmap=1; +CREATE TABLE t1(a INT) PARTITION BY HASH(a) PARTITIONS 1; +INSERT INTO t1 VALUES(0); +FLUSH TABLE t1; +TRUNCATE TABLE t1; +INSERT INTO t1 VALUES(0); +DROP TABLE t1; +SET GLOBAL myisam_use_mmap=default; End of 5.1 tests |