diff options
| author | unknown <ingo@mysql.com> | 2006-06-15 10:58:02 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-06-15 10:58:02 +0200 |
| commit | 6bc9973183fd16c458e6532ed200c3c718d31326 (patch) | |
| tree | c535f394cd568fd89d1abd5fe9312e81e7698ddb /sql/ha_myisammrg.h | |
| parent | e8288ff926cfa2e4c635c88e706c921a6f7b9235 (diff) | |
| parent | 2dd1dc62462a9b7348d1c815acacddedb5a62d88 (diff) | |
| download | mariadb-git-6bc9973183fd16c458e6532ed200c3c718d31326.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-amerge
into mysql.com:/home/mydev/mysql-5.1-amerge
mysql-test/r/lock_multi.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/lock_multi.test:
Manual merge
sql/ha_myisammrg.h:
Manual merge
Diffstat (limited to 'sql/ha_myisammrg.h')
| -rw-r--r-- | sql/ha_myisammrg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h index b67ec3dc204..d58a3523c26 100644 --- a/sql/ha_myisammrg.h +++ b/sql/ha_myisammrg.h @@ -38,7 +38,7 @@ 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_NO_COPY_ON_ALTER); + HA_CAN_BIT_FIELD | HA_NO_COPY_ON_ALTER); } ulong index_flags(uint inx, uint part, bool all_parts) const { |