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

Backport of:

Browse Source 
------------------------------------------------------------ 
revno: 2630.9.1 
committer: Dmitry Lenev <dlenev@mysql.com> 
branch nick: mysql-6.0-3726-w3 
timestamp: Sun 2008-06-08 22:13:58 +0400 
message: 
  WL#3726 "DDL locking for all metadata objects" 
   
  After review fixes in progress. 
   
  Some adjustments to the patch that removes thd->locked_tables
This commit is contained in:
Konstantin Osipov 2009-12-01 18:04:32 +03:00
parent 77be8ba5e0
commit 7846095831
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sp_head.cc
View File

@ -1257,7 +1257,7 @@ sp_head::execute(THD *thd)
Will write this SP statement into binlog separately Will write this SP statement into binlog separately
(TODO: consider changing the condition to "not inside event union") (TODO: consider changing the condition to "not inside event union")
*/ */
if (thd->locked_tables_mode == LTM_NONE) if (thd->locked_tables_mode <= LTM_LOCK_TABLES)
thd->user_var_events_alloc= thd->mem_root; thd->user_var_events_alloc= thd->mem_root;
err_status= i->execute(thd, &ip); err_status= i->execute(thd, &ip);
@ -1269,7 +1269,7 @@ sp_head::execute(THD *thd)
If we've set thd->user_var_events_alloc to mem_root of this SP If we've set thd->user_var_events_alloc to mem_root of this SP
statement, clean all the events allocated in it. statement, clean all the events allocated in it.
*/ */
if (thd->locked_tables_mode == LTM_NONE) if (thd->locked_tables_mode <= LTM_LOCK_TABLES)
{ {
reset_dynamic(&thd->user_var_events); reset_dynamic(&thd->user_var_events);
thd->user_var_events_alloc= NULL;//DEBUG thd->user_var_events_alloc= NULL;//DEBUG
@ -2740,7 +2740,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
thd->query_id= next_query_id(); thd->query_id= next_query_id();
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
if (thd->locked_tables_mode == LTM_NONE) if (thd->locked_tables_mode <= LTM_LOCK_TABLES)
{ {
/* /*
This statement will enter/leave prelocked mode on its own. This statement will enter/leave prelocked mode on its own.

12
sql/sql_base.cc
View File

@ -1375,6 +1375,7 @@ void close_thread_tables(THD *thd,
bool skip_mdl) bool skip_mdl)
{ {
TABLE *table; TABLE *table;
bool clear_table_lock_option= FALSE;
DBUG_ENTER("close_thread_tables"); DBUG_ENTER("close_thread_tables");
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
@ -1446,6 +1447,11 @@ void close_thread_tables(THD *thd,
/* /*
We are under simple LOCK TABLES or we're inside a sub-statement We are under simple LOCK TABLES or we're inside a sub-statement
of a prelocked statement, so should not do anything else. of a prelocked statement, so should not do anything else.
Note that even if we are in LTM_LOCK_TABLES mode and statement
requires prelocking (e.g. when we are closing tables after
failing ot "open" all tables required for statement execution)
we will exit this function a few lines below.
*/ */
if (! thd->lex->requires_prelocking()) if (! thd->lex->requires_prelocking())
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@ -1462,7 +1468,7 @@ void close_thread_tables(THD *thd,
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
thd->locked_tables_mode= LTM_NONE; thd->locked_tables_mode= LTM_NONE;
thd->options&= ~OPTION_TABLE_LOCK; clear_table_lock_option= TRUE;
/* /*
Note that we are leaving prelocked mode so we don't need Note that we are leaving prelocked mode so we don't need
@ -1502,6 +1508,9 @@ void close_thread_tables(THD *thd,
mdl_remove_all_locks(&thd->mdl_context); mdl_remove_all_locks(&thd->mdl_context);
} }
if (clear_table_lock_option)
thd->options&= ~OPTION_TABLE_LOCK;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -5452,6 +5461,7 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count,
need to care about THD::locked_tables_root here. need to care about THD::locked_tables_root here.
*/ */
mysql_unlock_tables(thd, thd->lock); mysql_unlock_tables(thd, thd->lock);
thd->lock= 0;
thd->options&= ~(OPTION_TABLE_LOCK); thd->options&= ~(OPTION_TABLE_LOCK);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }