1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/my/mysql-4.1
This commit is contained in:
monty@mysql.com 2005-06-03 01:16:29 +03:00
commit 0dd94ed426
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -1714,7 +1714,7 @@ int open_and_lock_tables(THD *thd, TABLE_LIST *tables)
SYNOPSIS SYNOPSIS
open_normal_and_derived_tables open_normal_and_derived_tables
thd - thread handler thd - thread handler
tables - list of tables for open&locking tables - list of tables for open
RETURN RETURN
FALSE - ok FALSE - ok

13
sql/sql_parse.cc
View File

@ -2515,11 +2515,6 @@ mysql_execute_command(THD *thd)
*/ */
start_waiting_global_read_lock(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: unsent_create_error:
// put tables back for PS rexecuting // put tables back for PS rexecuting
tables= lex->link_first_table_back(tables, create_table, tables= lex->link_first_table_back(tables, create_table,
@ -3692,14 +3687,6 @@ error:
thd->lock= 0; thd->lock= 0;
} }
DBUG_VOID_RETURN; 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;
} }