diff options
| author | unknown <serg@serg.mylan> | 2005-10-08 14:46:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-08 14:46:04 +0200 |
| commit | 51907576bd358fe8ffcf08ad490cc5ac95a0f385 (patch) | |
| tree | 7de7976c373c2b9bc2b4f15bab50cc1560decda1 /sql/sql_parse.cc | |
| parent | b337566babce87b4a5854f18586206525a4ba1b7 (diff) | |
| download | mariadb-git-51907576bd358fe8ffcf08ad490cc5ac95a0f385.tar.gz | |
Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
don't allow STOP SLAVE if global read lock is in taken
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 5d233fd7be0..3a538a7629b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2601,7 +2601,7 @@ unsent_create_error: To prevent that, refuse SLAVE STOP if the client thread has locked tables */ - if (thd->locked_tables || thd->active_transaction()) + if (thd->locked_tables || thd->active_transaction() || thd->global_read_lock) { send_error(thd,ER_LOCK_OR_ACTIVE_TRANSACTION); break; |