Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged

1 files changed, 0 insertions, 13 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 17133474190..f0ea0a762bd 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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;
 }