Commit ed5774f0 authored by monty@mysql.com's avatar monty@mysql.com

Removed duplicated and wrong merged code

parent e877e71b
......@@ -1714,7 +1714,7 @@ int open_and_lock_tables(THD *thd, TABLE_LIST *tables)
SYNOPSIS
open_normal_and_derived_tables
thd - thread handler
tables - list of tables for open&locking
tables - list of tables for open
RETURN
FALSE - ok
......
......@@ -2517,11 +2517,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,
......@@ -3694,14 +3689,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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment