Commit 74f3014c authored by unknown's avatar unknown
Browse files

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

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


sql/sql_parse.cc:
  Auto merged
parents 336d32b1 1b999482

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/sql_parse.cc

+0 −13
Original line number Diff line number Diff line
@@ -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 @@ purposes internal to the MySQL server", MYF(0)); 
      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;

}