diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 08:37:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-19 08:37:38 +0200 |
| commit | e7c6f83bce0ef08da74d4b9b3959a15f2648cacd (patch) | |
| tree | 5a5e6742773296e0f61feb71aea0baf8a6b799fe /sql/sql_class.cc | |
| parent | a1315a650a69745bac7166cfe1423215dfaac6e1 (diff) | |
| parent | 03497129371fe2c16d847b7e83a5eeecab9c34a2 (diff) | |
| download | mariadb-git-bb-10.2-mdev-11623.tar.gz | |
Merge 10.1 to 10.2.bb-10.2-mdev-11623
Most notably, this includes MDEV-11623, which includes a fix and
an upgrade procedure for the InnoDB file format incompatibility
that is present in MariaDB Server 10.1.0 through 10.1.20.
In other words, this merge should address
MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5c7cfdce657..f78382ded7d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2008, 2016, MariaDB + Copyright (c) 2008, 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -742,8 +742,8 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) #endif { ulong tmp; + bzero(&variables, sizeof(variables)); - mdl_context.init(this); /* We set THR_THD to temporally point to this THD to register all the variables that allocates memory for this THD @@ -753,8 +753,11 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) status_var.local_memory_used= sizeof(THD); status_var.global_memory_used= 0; variables.pseudo_thread_id= thread_id; + variables.max_mem_used= global_system_variables.max_mem_used; main_da.init(); + mdl_context.init(this); + /* Pass nominal parameters to init_alloc_root only to ensure that the destructor works OK in case of an error. The main_mem_root @@ -800,7 +803,6 @@ THD::THD(my_thread_id id, bool is_wsrep_applier) connection_name.str= 0; connection_name.length= 0; - bzero(&variables, sizeof(variables)); file_id = 0; query_id= 0; query_name_consts= 0; |