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

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

Merge vajra.(none):/opt/local/work/mysql-5.0-21483
into vajra.(none):/opt/local/work/mysql-5.1-21483
1683d65a · kostja@vajra.(none) · 752972b5 · bb2a43dd · 1683d65a
Commit 1683d65a authored May 16, 2007 by kostja@vajra.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_insert.cc sql/sql_insert.cc +1 -1

No files found.
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1858,7 +1858,7 @@ bool delayed_get_table(THD *thd, TABLE_LIST *table_list)
  pthread_mutex_unlock(&tmp->mutex);
  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;
  }
  /* Unlock the delayed insert object after its last access. */