diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-11 16:22:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-14 19:45:59 +0200 |
| commit | 023131e3954e17d315e3cb21145af979c286b672 (patch) | |
| tree | 826cd942deba88e53475e9d6bae14c685e9dabf3 | |
| parent | dd67456af38baaeb9a7a1c2263755cf0c0b56ff1 (diff) | |
| download | mariadb-git-023131e3954e17d315e3cb21145af979c286b672.tar.gz | |
InnoDB: restore thd->proc_info in innobase_reset_background_thd()
| -rw-r--r-- | mysql-test/suite/innodb/r/purge_thread_shutdown.result | 8 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/innodb/r/purge_thread_shutdown.result b/mysql-test/suite/innodb/r/purge_thread_shutdown.result index 0a7b31a8cb8..58b5c31461a 100644 --- a/mysql-test/suite/innodb/r/purge_thread_shutdown.result +++ b/mysql-test/suite/innodb/r/purge_thread_shutdown.result @@ -3,11 +3,11 @@ insert t1 values (1),(2),(3),(4); delete from t1 where a=1; select user,state from information_schema.processlist order by 2; user state -system user -system user -system user -system user root Filling schema table +system user InnoDB purge coordinator +system user InnoDB purge worker +system user InnoDB purge worker +system user InnoDB purge worker system user InnoDB shutdown handler set global debug_dbug='+d,only_kill_system_threads'; connect con1, localhost, root; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 41ff234139e..2907310013c 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1746,8 +1746,9 @@ innobase_reset_background_thd(MYSQL_THD thd) ut_ad(THDVAR(thd, background_thread)); /* background purge thread */ + const char *proc_info= thd_proc_info(thd, "reset"); reset_thd(thd); - thd_proc_info(thd, ""); + thd_proc_info(thd, proc_info); } |