diff options
| author | unknown <istruewing@chilla.local> | 2007-03-06 12:35:58 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-06 12:35:58 +0100 |
| commit | 1d6584e61cce7b2a9e2fd0d85becae66c6557bb4 (patch) | |
| tree | b5e7fd77af400ddf6416bcffa2fe76bf67bb8ceb /storage/myisammrg | |
| parent | 8bf49833318770d5e9a559b8cdc66f9cc02a5f55 (diff) | |
| parent | 2f863451b5c5fe848d26f5f87ae27f13415805b3 (diff) | |
| download | mariadb-git-1d6584e61cce7b2a9e2fd0d85becae66c6557bb4.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-bug26464
into chilla.local:/home/mydev/mysql-5.1-bug26464
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Bug#26464 - insert delayed + update + merge = corruption
Manual merge from 5.0
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h index ffa55673ad1..04379f6cf70 100644 --- a/storage/myisammrg/ha_myisammrg.h +++ b/storage/myisammrg/ha_myisammrg.h @@ -36,8 +36,8 @@ class ha_myisammrg: public handler { return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_NO_TRANSACTIONS | 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_NO_COPY_ON_ALTER); + HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD | + HA_NO_COPY_ON_ALTER); } ulong index_flags(uint inx, uint part, bool all_parts) const { |