diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-11-01 13:07:55 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-11-02 10:08:54 +0200 |
| commit | eab7f5d8bc68f2430c12807582e80a3ab420a0fa (patch) | |
| tree | 68065ea1a315573e3386906b3e83601100a301e9 /sql/sql_parse.cc | |
| parent | 5900f3a782c6dda6a3bc3d5865e135bf89ad6347 (diff) | |
| download | mariadb-git-eab7f5d8bc68f2430c12807582e80a3ab420a0fa.tar.gz | |
MDEV-23328 Server hang due to Galera lock conflict resolution
* Fix error handling NULL-pointer reference
* Add mtr-suppression on galera_ssl_upgrade
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 27d716c2162..6587a948760 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -9358,7 +9358,9 @@ void sql_kill(THD *thd, longlong id, killed_state state, killed_type type) #ifdef WITH_WSREP return; wsrep_error_label: - my_error(ER_CANNOT_USER, MYF(0), wsrep_thd_query(thd)); + error= (type == KILL_TYPE_QUERY ? ER_KILL_QUERY_DENIED_ERROR : + ER_KILL_DENIED_ERROR); + my_error(error, MYF(0), id); #endif /* WITH_WSREP */ } @@ -9393,7 +9395,7 @@ void sql_kill_user(THD *thd, LEX_USER *user, killed_state state) #ifdef WITH_WSREP return; wsrep_error_label: - my_error(ER_CANNOT_USER, MYF(0), user->user.str); + my_error(ER_CANNOT_USER, MYF(0), user ? user->user.str : "NULL"); #endif /* WITH_WSREP */ } |