diff options
| author | Ingo Struewing <ingo.struewing@sun.com> | 2009-10-02 13:27:48 +0200 |
|---|---|---|
| committer | Ingo Struewing <ingo.struewing@sun.com> | 2009-10-02 13:27:48 +0200 |
| commit | 91178418a2bfd21852ae03fbcc5a9aa4c26429c6 (patch) | |
| tree | 2abe30b77ac2a2ce2e50173dc413ee879d722c3a /libmysqld | |
| parent | 1f37e3d834c9c1c1d6c43c1d78e2b6032a4b7ec8 (diff) | |
| parent | 41e0d0a3ab76fcd78b7375ab28cd5e8c4e71bdf9 (diff) | |
| download | mariadb-git-91178418a2bfd21852ae03fbcc5a9aa4c26429c6.tar.gz | |
auto-merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index d4a200c07b2..778d4874ad4 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -142,6 +142,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, if (!skip_check) result= thd->is_error() ? -1 : 0; + thd->mysys_var= 0; + #if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER) thd->profiling.finish_current_query(); #endif @@ -634,6 +636,7 @@ void *create_embedded_thd(int client_flag) thread_count++; threads.append(thd); + thd->mysys_var= 0; return thd; err: delete(thd); |