diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:34:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:34:09 +0200 |
| commit | 5ad68a0d2f66b2d36f0a509c443829d58477caa2 (patch) | |
| tree | 50db6c8c76f336bdecce14bdc8a64b6e4fd0e13f /sql/table.h | |
| parent | cda52b2cb28091c4372880a2b68a9174f21bd885 (diff) | |
| download | mariadb-git-5ad68a0d2f66b2d36f0a509c443829d58477caa2.tar.gz | |
don't use I_S constants for open_table_def and get_table_share,
have a specially defined enum with clearly named values
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index 90907230f78..18ed635aae8 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2433,10 +2433,13 @@ static inline void dbug_tmp_restore_column_maps(MY_BITMAP *read_set, #endif } +enum read_frm_op { + FRM_READ_TABLE_ONLY, + FRM_READ_NO_ERROR_FOR_VIEW +}; size_t max_row_length(TABLE *table, const uchar *data); - void init_mdl_requests(TABLE_LIST *table_list); int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, @@ -2451,7 +2454,8 @@ void init_tmp_table_share(THD *thd, TABLE_SHARE *share, const char *key, uint key_length, const char *table_name, const char *path); void free_table_share(TABLE_SHARE *share); -int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags); +int open_table_def(THD *thd, TABLE_SHARE *share, + enum read_frm_op op = FRM_READ_TABLE_ONLY); void open_table_error(TABLE_SHARE *share, int error, int db_errno, int errarg); void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form); bool check_and_convert_db_name(LEX_STRING *db, bool preserve_lettercase); |