diff options
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index fe61666bf20..40f5eb0f1ab 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -832,6 +832,8 @@ typedef bool Log_func(THD*, TABLE*, bool, const uchar*, const uchar*); #define ALTER_PARTITION_TABLE_REORG (1ULL << 12) #define ALTER_PARTITION_CONVERT_IN (1ULL << 13) #define ALTER_PARTITION_CONVERT_OUT (1ULL << 14) +// Set for vers_add_auto_hist_parts() operation +#define ALTER_PARTITION_AUTO_HIST (1ULL << 15) /* This is master database for most of system tables. However there @@ -2148,7 +2150,6 @@ struct Vers_parse_info: public Table_period_info Table_period_info::start_end_t as_row; -protected: friend struct Table_scope_and_contents_source_st; void set_start(const LEX_CSTRING field_name) { @@ -2160,6 +2161,8 @@ protected: as_row.end= field_name; period.end= field_name; } + +protected: bool is_start(const char *name) const; bool is_end(const char *name) const; bool is_start(const Create_field &f) const; @@ -4257,6 +4260,8 @@ public: */ virtual uint lock_count(void) const { return 1; } /** + Get the lock(s) for the table and perform conversion of locks if needed. + Is not invoked for non-transactional temporary tables. @note store_lock() can return more than one lock if the table is MERGE |