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

Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/t/rpl_flush_tables.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2005-10-08 16:56:10 +02:00
parent 0f60474f29 51907576bd
commit 3a97babbc2
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -2944,7 +2944,7 @@ end_with_restore_list:
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)
{
my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));