summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-01-15 22:41:24 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2021-01-15 22:41:24 +0100
commit88011214fc25d801c76ad63b9cdb8962c5eb8a66 (patch)
treec04f8ebee3d8877d46bade24e20177ceb121eb7e
parenta6e451dc7272c408ace8b3fb4d86c79263f7247e (diff)
downloadmariadb-git-bb-10.4-MDEV-23542-try.tar.gz
MDEV-23542: Server crashes in thd_clear_errors()bb-10.4-MDEV-23542-try
Chek if thd->mysys_var is avaliable
-rw-r--r--sql/sql_class.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 7327f270c33..489bf3b654b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -308,7 +308,8 @@ THD *thd_get_current_thd()
void thd_clear_errors(THD *thd)
{
my_errno= 0;
- thd->mysys_var->abort= 0;
+ if (thd->mysys_var)
+ thd->mysys_var->abort= 0;
}