mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
@ -2515,11 +2515,6 @@ mysql_execute_command(THD *thd)
|
||||
*/
|
||||
start_waiting_global_read_lock(thd);
|
||||
|
||||
// put tables back for PS rexecuting
|
||||
tables= lex->link_first_table_back(tables, create_table,
|
||||
create_table_local);
|
||||
break;
|
||||
|
||||
unsent_create_error:
|
||||
// put tables back for PS rexecuting
|
||||
tables= lex->link_first_table_back(tables, create_table,
|
||||
@ -3692,14 +3687,6 @@ error:
|
||||
thd->lock= 0;
|
||||
}
|
||||
DBUG_VOID_RETURN;
|
||||
|
||||
error1:
|
||||
/*
|
||||
Release the protection against the global read lock and wake
|
||||
everyone, who might want to set a global read lock.
|
||||
*/
|
||||
start_waiting_global_read_lock(thd);
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user