database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-23328 Server hang due to Galera lock conflict resolution

Browse Source 
* Fix error handling NULL-pointer reference
* Add mtr-suppression on galera_ssl_upgrade
This commit is contained in:
Jan Lindström
2021-11-01 13:07:55 +02:00
parent db50ea3ad3
commit ea239034de
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -9093,7 +9093,7 @@ 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));
my_error(ER_CANNOT_USER, MYF(0), " ");
#endif /* WITH_WSREP */
}
@ -9128,7 +9128,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), " ");
#endif /* WITH_WSREP */
}