diff options
| author | unknown <anozdrin/alik@quad.> | 2008-02-18 18:12:37 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.> | 2008-02-18 18:12:37 +0300 |
| commit | 31b1bc985feca22c66049bba277ad962c5be66c4 (patch) | |
| tree | c3fcec384871c10cbba758ddc9e24dd339528f8b /sql/sql_class.cc | |
| parent | a77151c75465a84b79a7239b2a976c39715ef082 (diff) | |
| parent | 168027ec7d9add2cf6bafd904d0f0834fe8dc839 (diff) | |
| download | mariadb-git-31b1bc985feca22c66049bba277ad962c5be66c4.tar.gz | |
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqlbinlog.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 044ea70e994..176381e77c4 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -769,6 +769,10 @@ void THD::init_for_queries() void THD::change_user(void) { + pthread_mutex_lock(&LOCK_status); + add_to_status(&global_status_var, &status_var); + pthread_mutex_unlock(&LOCK_status); + cleanup(); killed= NOT_KILLED; cleanup_done= 0; |