diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-14 16:29:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-14 16:29:23 +0200 |
| commit | dd13db6f4ae70f45038c1d000cb1439e17170d98 (patch) | |
| tree | 54f4631095339c004a572909a9909c291e16528d /mysys/my_delete.c | |
| parent | bde11c1ab59c40be6043e156b0427e1d7105ec85 (diff) | |
| download | mariadb-git-dd13db6f4ae70f45038c1d000cb1439e17170d98.tar.gz | |
MDEV-5829: STOP SLAVE resets global status variables
Reason for the bug was an optimization for higher connect speed where we moved when global status was updated,
but forgot to update states when slave thread dies.
Fixed by adding thd->add_status_to_global() before deleting slave thread's thd.
mysys/my_delete.c:
Added missing newline
sql/mysqld.cc:
Use add_status_to_global()
sql/slave.cc:
Added missing add_status_to_global()
sql/sql_class.cc:
Use add_status_to_global()
sql/sql_class.h:
Simplify adding local status to global by adding add_status_to_global()
Diffstat (limited to 'mysys/my_delete.c')
| -rw-r--r-- | mysys/my_delete.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_delete.c b/mysys/my_delete.c index f5737ea66e0..155e925e9ba 100644 --- a/mysys/my_delete.c +++ b/mysys/my_delete.c @@ -150,4 +150,4 @@ error: my_osmaperr(last_error); DBUG_RETURN(-1); } -#endif
\ No newline at end of file +#endif |