diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
| commit | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (patch) | |
| tree | 31068acc0b39c208d35d524688a5985831af0447 /sql/table.h | |
| parent | 8a23ae088dc38f591efeab9eccdef5eb9094add9 (diff) | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| download | mariadb-git-5f6380adde2dac3f32b40339b9b702c0135eb7d6.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/table.h b/sql/table.h index af79bffd437..c7282cee093 100644 --- a/sql/table.h +++ b/sql/table.h @@ -672,8 +672,7 @@ struct TABLE_SHARE inline handlerton *db_type() const /* table_type for handler */ { return is_view ? view_pseudo_hton : - db_plugin ? plugin_data(db_plugin, handlerton*) - : NULL; + db_plugin ? plugin_hton(db_plugin) : NULL; } enum row_type row_type; /* How rows are stored */ enum tmp_table_type tmp_table; @@ -742,7 +741,7 @@ struct TABLE_SHARE char *partition_info_str; uint partition_info_str_len; uint partition_info_buffer_size; - handlerton *default_part_db_type; + plugin_ref default_part_plugin; #endif /** @@ -1983,7 +1982,6 @@ struct TABLE_LIST /* For transactional locking. */ int lock_timeout; /* NOWAIT or WAIT [X] */ bool lock_transactional; /* If transactional lock requested. */ - bool internal_tmp_table; /** TRUE if an alias for this table was specified in the SQL. */ bool is_alias; /** TRUE if the table is referred to in the statement using a fully @@ -2497,7 +2495,8 @@ enum get_table_share_flags { GTS_TABLE = 1, GTS_VIEW = 2, GTS_NOLOCK = 4, - GTS_FORCE_DISCOVERY = 8 + GTS_USE_DISCOVERY = 8, + GTS_FORCE_DISCOVERY = 16 }; size_t max_row_length(TABLE *table, const uchar *data); |