diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 20:00:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:41 +0100 |
| commit | 0508d327aef520d3131ff8a85ed610337149fffc (patch) | |
| tree | 7e04769f49b4aded9053adcad442fe00eb487d98 /sql/handler.h | |
| parent | bb8c82c66abddf796e8d44f817518e5ab38ae6e4 (diff) | |
| parent | 34db9958e28c325b0f708f78b7ff029de810d5ea (diff) | |
| download | mariadb-git-0508d327aef520d3131ff8a85ed610337149fffc.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 229197a2c78..848c9956868 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1686,7 +1686,6 @@ struct Table_scope_and_contents_source_st uint options; /* OR of HA_CREATE_ options */ uint merge_insert_method; uint extra_size; /* length of extra data segment */ - SQL_I_List<TABLE_LIST> merge_list; handlerton *db_type; /** Row type of the table definition. @@ -1717,6 +1716,7 @@ struct Table_scope_and_contents_source_st TABLE_LIST *pos_in_locked_tables; MDL_ticket *mdl_ticket; bool table_was_deleted; + TABLE_LIST *merge_list; void init() { |