Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
This commit is contained in:
commit
f87e6b866f
@ -857,6 +857,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
|
|||||||
if ((table=table_ptr[i])->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
|
if ((table=table_ptr[i])->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
|
||||||
continue;
|
continue;
|
||||||
lock_type= table->reginfo.lock_type;
|
lock_type= table->reginfo.lock_type;
|
||||||
|
DBUG_ASSERT (lock_type != TL_WRITE_DEFAULT);
|
||||||
if (lock_type >= TL_WRITE_ALLOW_WRITE)
|
if (lock_type >= TL_WRITE_ALLOW_WRITE)
|
||||||
{
|
{
|
||||||
*write_lock_used=table;
|
*write_lock_used=table;
|
||||||
|
@ -2255,7 +2255,6 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
|
|||||||
HASH_SEARCH_STATE state;
|
HASH_SEARCH_STATE state;
|
||||||
DBUG_ENTER("open_table");
|
DBUG_ENTER("open_table");
|
||||||
|
|
||||||
DBUG_ASSERT (table_list->lock_type != TL_WRITE_DEFAULT);
|
|
||||||
/* find a unused table in the open table cache */
|
/* find a unused table in the open table cache */
|
||||||
if (refresh)
|
if (refresh)
|
||||||
*refresh=0;
|
*refresh=0;
|
||||||
@ -3559,11 +3558,6 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
|
|||||||
{
|
{
|
||||||
safe_to_ignore_table= FALSE;
|
safe_to_ignore_table= FALSE;
|
||||||
|
|
||||||
if (tables->lock_type == TL_WRITE_DEFAULT)
|
|
||||||
{
|
|
||||||
tables->lock_type= thd->update_lock_default;
|
|
||||||
DBUG_ASSERT (tables->lock_type >= TL_WRITE_ALLOW_WRITE);
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
Ignore placeholders for derived tables. After derived tables
|
Ignore placeholders for derived tables. After derived tables
|
||||||
processing, link to created temporary table will be put here.
|
processing, link to created temporary table will be put here.
|
||||||
@ -3708,7 +3702,8 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (tables->lock_type != TL_UNLOCK && ! thd->locked_tables)
|
if (tables->lock_type != TL_UNLOCK && ! thd->locked_tables)
|
||||||
tables->table->reginfo.lock_type=tables->lock_type;
|
tables->table->reginfo.lock_type= tables->lock_type == TL_WRITE_DEFAULT ?
|
||||||
|
thd->update_lock_default : tables->lock_type;
|
||||||
tables->table->grant= tables->grant;
|
tables->table->grant= tables->grant;
|
||||||
|
|
||||||
process_view_routines:
|
process_view_routines:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user