Commit c51b8905 authored by unknown's avatar unknown

Merge vajra.(none):/opt/local/work/mysql-5.0-21483

into  vajra.(none):/opt/local/work/mysql-5.1-21483


sql/sql_insert.cc:
  Auto merged
parents 5ac4515a 75392f37
...@@ -1858,7 +1858,7 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list) ...@@ -1858,7 +1858,7 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list)
pthread_mutex_unlock(&tmp->mutex); pthread_mutex_unlock(&tmp->mutex);
if (table_list->table) if (table_list->table)
{ {
DBUG_ASSERT(tmp->thd.net.report_error == 0 && thd->net.report_error == 0); DBUG_ASSERT(thd->net.report_error == 0);
thd->di=tmp; thd->di=tmp;
} }
/* Unlock the delayed insert object after its last access. */ /* Unlock the delayed insert object after its last access. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment