diff options
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 8d07e5940a3..d038de7a88f 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -56,11 +56,6 @@ #endif #define ER_THD_OR_DEFAULT(thd,X) ((thd) ? ER_THD(thd, (X)) : ER_DEFAULT(X)) - -#define ME_INFO (ME_HOLDTANG | ME_NOREFRESH) -#define ME_ERROR (ME_BELL | ME_NOREFRESH) -#define MYF_RW MYF(MY_WME+MY_NABP) /* Vid my_read & my_write */ - #define SPECIAL_USE_LOCKS 1 /* Lock used databases */ #define SPECIAL_NO_NEW_FUNC 2 /* Skip new functions */ #define SPECIAL_SKIP_SHOW_DB 4 /* Don't allow 'show db' */ @@ -175,6 +170,7 @@ enum extra2_frm_value_type { EXTRA2_TABLEDEF_VERSION=0, EXTRA2_DEFAULT_PART_ENGINE=1, EXTRA2_GIS=2, + EXTRA2_APPLICATION_TIME_PERIOD=3, EXTRA2_PERIOD_FOR_SYSTEM_TIME=4, #define EXTRA2_ENGINE_IMPORTANT 128 @@ -184,14 +180,10 @@ enum extra2_frm_value_type { }; enum extra2_field_flags { - VERS_OPTIMIZED_UPDATE= 1 << INVISIBLE_MAX_BITS + VERS_OPTIMIZED_UPDATE= 1 << INVISIBLE_MAX_BITS, }; -int rea_create_table(THD *thd, LEX_CUSTRING *frm, - const char *path, const char *db, const char *table_name, - HA_CREATE_INFO *create_info, handler *file, - bool no_ha_create_table); -LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING *table, +LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING &table, HA_CREATE_INFO *create_info, List<Create_field> &create_fields, uint keys, KEY *key_info, handler *db_file); |