diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-18 09:50:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-19 13:36:21 +0100 |
| commit | 865548fc8d0574e6418b66def39b6d36bbc0205a (patch) | |
| tree | 21489f525ada1e65b4d4fa51bd6c9d9925d9a317 /sql/sql_class.cc | |
| parent | 3b9423fda2612a463e9f3af5750234ccf2667545 (diff) | |
| download | mariadb-git-865548fc8d0574e6418b66def39b6d36bbc0205a.tar.gz | |
MDEV-9088 Server crashes on shutdown after the second post of feedback report
On shutdown feedback was sending a short report without creating
a THD. At that point current_thd was pointing to the already
destroyed THD from the previous full report.
backport from 10.1:
commit bfe703a
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Feb 3 18:19:56 2015 +0100
don't let current_thd to point to a destroyed THD
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 583abee360f..7a9cdad84f6 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1645,7 +1645,7 @@ THD::~THD() DBUG_ASSERT(status_var.memory_used == 0); // Ensure everything is freed } - set_current_thd(orig_thd); + set_current_thd(orig_thd == this ? 0 : orig_thd); DBUG_VOID_RETURN; } |