diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /libmysqld/lib_sql.cc | |
| parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
| parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
| download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -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 2622ae6988f..7de1ecd6ef3 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); |