diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-02 10:06:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-02 10:06:29 +0100 |
| commit | fa11d613cfbaee23d48cabfb65435d83adee7818 (patch) | |
| tree | bd90c2e71a319c8366d355c79d33a985130330b6 /storage | |
| parent | d929342b0f8d5a85aac4e76486b0ff2aff7ca54f (diff) | |
| download | mariadb-git-fa11d613cfbaee23d48cabfb65435d83adee7818.tar.gz | |
MySQL WL#5522 - InnoDB transportable tablespaces.
Cleanups:
* remove unused HA_EXTRA_EXPORT (can be added later if needed, e.g. for Aria)
* clarify the meaning of HA_CAN_EXPORT
* make all engines that support EXPORT to announce it
* reduce code duplication
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/ha_archive.h | 2 | ||||
| -rw-r--r-- | storage/csv/ha_tina.h | 2 | ||||
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 2 | ||||
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 47ee89198e6..56ff566db8c 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -107,7 +107,7 @@ public: { return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_CAN_BIT_FIELD | HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | - HA_STATS_RECORDS_IS_EXACT | + HA_STATS_RECORDS_IS_EXACT | HA_CAN_EXPORT | HA_HAS_RECORDS | HA_CAN_REPAIR | HA_FILE_BASED | HA_CAN_INSERT_DELAYED | HA_CAN_GEOMETRY); } diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h index ebf62fbed65..000b46b2bb2 100644 --- a/storage/csv/ha_tina.h +++ b/storage/csv/ha_tina.h @@ -106,7 +106,7 @@ public: ulonglong table_flags() const { return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_NO_AUTO_INCREMENT | - HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | + HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_CAN_EXPORT | HA_CAN_REPAIR); } ulong index_flags(uint idx, uint part, bool all_parts) const diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 6bedc5c07aa..4fb51e610bb 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -667,7 +667,7 @@ ha_myisam::ha_myisam(handlerton *hton, TABLE_SHARE *table_arg) :handler(hton, table_arg), file(0), int_table_flags(HA_NULL_IN_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER | HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | - HA_CAN_VIRTUAL_COLUMNS | + HA_CAN_VIRTUAL_COLUMNS | HA_CAN_EXPORT | HA_DUPLICATE_POS | HA_CAN_INDEX_BLOBS | HA_AUTO_PART_KEY | HA_FILE_BASED | HA_CAN_GEOMETRY | HA_NO_TRANSACTIONS | HA_CAN_INSERT_DELAYED | HA_CAN_BIT_FIELD | HA_CAN_RTREEKEYS | diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h index 6b4301616d9..e5a74baa1ae 100644 --- a/storage/myisammrg/ha_myisammrg.h +++ b/storage/myisammrg/ha_myisammrg.h @@ -89,7 +89,7 @@ public: HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED | HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD | - HA_HAS_RECORDS | + HA_HAS_RECORDS | HA_CAN_EXPORT | HA_NO_COPY_ON_ALTER | HA_DUPLICATE_POS); } |