diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
| commit | 2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd (patch) | |
| tree | 9e2129be0d36d6d157a26e783f07de8eb7b52bd2 /sql/sql_class.cc | |
| parent | fb135f7ee570a199d78db7c3222db1980b75060f (diff) | |
| parent | cea27d300236436cfc0a0fca6c0993c3867be8f6 (diff) | |
| download | mariadb-git-2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd.tar.gz | |
Automatic merge with 5.2
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 9bb1f83b06d..1ed0fbf5ece 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1095,6 +1095,11 @@ void THD::cleanup(void) lock=locked_tables; locked_tables=0; close_thread_tables(this); } + if (user_connect) + { + decrease_user_connections(user_connect); + user_connect= 0; // Safety + } wt_thd_destroy(&transaction.wt); #if defined(ENABLED_DEBUG_SYNC) |