diff options
| author | unknown <serg@serg.mysql.com> | 2001-10-23 10:54:12 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-10-23 10:54:12 +0200 |
| commit | adb261ec4dc3cad0dff1133784e70679e22206a7 (patch) | |
| tree | b3064f15eee53d0ff97d9877fadf42f4ab8bd224 /sql/ha_innobase.h | |
| parent | 87e036a233558d1867b9280679e302f7cc997bee (diff) | |
| parent | 11572916ffb543e5b89db156a46a265d251bf768 (diff) | |
| download | mariadb-git-adb261ec4dc3cad0dff1133784e70679e22206a7.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/ha_innobase.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/ha_innobase.h')
| -rw-r--r-- | sql/ha_innobase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index 3b0144a4fca..404b20edbac 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -79,7 +79,7 @@ class ha_innobase: public handler HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER | HA_HAVE_KEY_READ_ONLY | HA_READ_NOT_EXACT_KEY | HA_LONGLONG_KEYS | HA_NULL_KEY | - HA_NOT_EXACT_COUNT | + HA_NOT_EXACT_COUNT | HA_NO_FULLTEXT_KEY | HA_NO_WRITE_DELAYED | HA_PRIMARY_KEY_IN_READ_INDEX | HA_DROP_BEFORE_CREATE | |