database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge patch for LOCK TABLES and SLAVE STOP

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2002-12-13 16:36:08 +02:00
parent af5ff70101 7d94b23a04
commit a716ca2c45
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_parse.cc
View File

@ -1630,6 +1630,24 @@ mysql_execute_command(void)
break; break;
} }
case SQLCOM_SLAVE_STOP: case SQLCOM_SLAVE_STOP:
/*
If the client thread has locked tables, a deadlock is possible.
Assume that
- the client thread does LOCK TABLE t READ.
- then the master updates t.
- then the SQL slave thread wants to update t,
so it waits for the client thread because t is locked by it.
- then the client thread does SLAVE STOP.
SLAVE STOP waits for the SQL slave thread to terminate its
update t, which waits for the client thread because t is locked by it.
To prevent that, refuse SLAVE STOP if the
client thread has locked tables
*/
if (thd->locked_tables || thd->active_transaction())
{
send_error(&thd->net,ER_LOCK_OR_ACTIVE_TRANSACTION);
break;
}
{ {
LOCK_ACTIVE_MI; LOCK_ACTIVE_MI;
stop_slave(thd,active_mi,1/* net report*/); stop_slave(thd,active_mi,1/* net report*/);