database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-17 13:06:41 +01:00
parent a89ee3cd15 1f020299f8
commit b64fde8f38
147 changed files with 1449 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.h
View File

@ -2072,6 +2072,7 @@ struct Table_scope_and_contents_source_pod_st // For trivial members
/* The following is used to remember the old state for CREATE OR REPLACE */
TABLE *table;
TABLE_LIST *pos_in_locked_tables;
TABLE_LIST *merge_list;
MDL_ticket *mdl_ticket;
bool table_was_deleted;
sequence_definition *seq_create_info;
@ -2099,14 +2100,11 @@ struct Table_scope_and_contents_source_pod_st // For trivial members
struct Table_scope_and_contents_source_st:
public Table_scope_and_contents_source_pod_st
{
SQL_I_List<TABLE_LIST> merge_list;
Vers_parse_info vers_info;
void init()
{
Table_scope_and_contents_source_pod_st::init();
merge_list.empty();
vers_info.init();
}