Removed duplicated and wrong merged code

sql/sql_base.cc:
  Fixed wrong comment

2 files changed, 1 insertions, 14 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 98ea4e0adf3..e3c0efb83b8 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -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
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index e01ec3d483b..1ee80eea4a9 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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;
 }