diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
| commit | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (patch) | |
| tree | 22f086fad2685d1a45b8531f96f30ed7fabb7554 /sql/sql_lex.cc | |
| parent | e01d33d773abbffad0ea1739f0e04816eecce89d (diff) | |
| parent | b65fd73bb19578148e41d788504ae18812c2cb43 (diff) | |
| download | mariadb-git-5b697c5a23ed7322b5b746b61e3ec66b510ca134.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index fa65589135d..96d61655e90 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -828,6 +828,7 @@ void lex_end_stage2(LEX *lex) /* Reset LEX_MASTER_INFO */ lex->mi.reset(lex->sql_command == SQLCOM_CHANGE_MASTER); + delete_dynamic(&lex->delete_gtid_domain); DBUG_VOID_RETURN; } @@ -3034,6 +3035,10 @@ LEX::LEX() INITIAL_LEX_PLUGIN_LIST_SIZE, 0); reset_query_tables_list(TRUE); mi.init(); + init_dynamic_array2(&delete_gtid_domain, sizeof(ulong*), + gtid_domain_static_buffer, + initial_gtid_domain_buffer_size, + initial_gtid_domain_buffer_size, 0); } |