diff options
| author | Monty <monty@mariadb.org> | 2018-02-01 20:03:18 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-02-01 20:03:44 +0200 |
| commit | 859fe1f24d499b34d31807d267a534a7f72e9c03 (patch) | |
| tree | 6fc1410c6868b9a96315e083eb75810daefd9d41 /sql/sql_class.cc | |
| parent | 44314c768f45ff7f0ad5d1133f4fd9ae0df12585 (diff) | |
| download | mariadb-git-859fe1f24d499b34d31807d267a534a7f72e9c03.tar.gz | |
Ensure that thd->user_var_events_alloc is always relevant
If binary logging is not enabled thd->user_var_events_alloc
would never be initialized.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d0b45441d83..6922a7ae5df 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -772,6 +772,12 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) init_sql_alloc(&main_mem_root, ALLOC_ROOT_MIN_BLOCK_SIZE, 0, MYF(MY_THREAD_SPECIFIC)); + /* + Allocation of user variables for binary logging is always done with main + mem root + */ + user_var_events_alloc= mem_root; + stmt_arena= this; thread_stack= 0; scheduler= thread_scheduler; // Will be fixed later |