diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /storage/myisammrg/ha_myisammrg.h | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'storage/myisammrg/ha_myisammrg.h')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h index 455819c5526..6b4301616d9 100644 --- a/storage/myisammrg/ha_myisammrg.h +++ b/storage/myisammrg/ha_myisammrg.h @@ -137,6 +137,7 @@ public: int extra_opt(enum ha_extra_function operation, ulong cache_size); int external_lock(THD *thd, int lock_type); uint lock_count(void) const; + int create_mrg(const char *name, HA_CREATE_INFO *create_info); int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info); THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); @@ -144,7 +145,10 @@ public: void append_create_info(String *packet); MYRG_INFO *myrg_info() { return file; } TABLE *table_ptr() { return table; } - bool check_if_incompatible_data(HA_CREATE_INFO *info, uint table_changes); + enum_alter_inplace_result check_if_supported_inplace_alter(TABLE *, + Alter_inplace_info *); + bool inplace_alter_table(TABLE *altered_table, + Alter_inplace_info *ha_alter_info); int check(THD* thd, HA_CHECK_OPT* check_opt); ha_rows records(); virtual uint count_query_cache_dependant_tables(uint8 *tables_type); |