diff options
| author | unknown <istruewing@chilla.local> | 2007-03-06 10:34:14 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-06 10:34:14 +0100 |
| commit | 5cdb8f92141e66159db7b9c05e7e3d823ae5dccb (patch) | |
| tree | 38bd31c78f1f089fbbc3b41296274ec6a1cdb3ea /sql/ha_myisammrg.h | |
| parent | 9bb421007aad07857eb07232ce035f080cbdff07 (diff) | |
| parent | 730ace194e0a797121375d227aac43d7d1c95799 (diff) | |
| download | mariadb-git-5cdb8f92141e66159db7b9c05e7e3d823ae5dccb.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug26464
into chilla.local:/home/mydev/mysql-5.0-bug26464
mysql-test/t/merge.test:
Auto merged
mysql-test/r/merge.result:
Bug#26464 - insert delayed + update + merge = corruption
Manual merge from 4.1
sql/ha_myisammrg.h:
Bug#26464 - insert delayed + update + merge = corruption
Manual merge from 4.1
Diffstat (limited to 'sql/ha_myisammrg.h')
| -rw-r--r-- | sql/ha_myisammrg.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index e546dfee699..16c734e2682 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -36,8 +36,7 @@ class ha_myisammrg: public handler { return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME | HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED | - HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE | - HA_CAN_BIT_FIELD); + HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD); } ulong index_flags(uint inx, uint part, bool all_parts) const { |