diff options
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index fad3c4b2b54..ee8dd7ac65e 100644 --- a/sql/table.h +++ b/sql/table.h @@ -134,7 +134,7 @@ typedef struct st_table_share uint *blob_field; /* Index to blobs in Field arrray*/ byte *default_values; /* row with default values */ - char *comment; /* Comment about table */ + LEX_STRING comment; /* Comment about table */ CHARSET_INFO *table_charset; /* Default charset of string fields */ MY_BITMAP all_set; @@ -712,7 +712,8 @@ typedef struct st_table_list thr_lock_type lock_type; uint outer_join; /* Which join type */ uint shared; /* Used in multi-upd */ - uint32 db_length, table_name_length; + uint db_length; + uint32 table_name_length; bool updatable; /* VIEW/TABLE can be updated now */ bool straight; /* optimize with prev table */ bool updating; /* for replicate-do/ignore table */ @@ -781,6 +782,11 @@ typedef struct st_table_list Security_context *find_view_security_context(THD *thd); bool prepare_view_securety_context(THD *thd); #endif + /* + Cleanup for re-execution in a prepared statement or a stored + procedure. + */ + void reinit_before_use(THD *thd); private: bool prep_check_option(THD *thd, uint8 check_opt_type); |