Subquery optimization backport: Duplicate Elimination:

process temporary table overflow correctly.

Subquery optimization backport: Duplicate Elimination:
process temporary table overflow correctly.
0857a5b8 · Sergey Petrunya · f47b2d38 · 0857a5b8
Commit 0857a5b8 authored Feb 12, 2010 by Sergey Petrunya
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/sql_select.cc sql/sql_select.cc +3 -3

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -16250,12 +16250,12 @@ int do_sj_dups_weedout(THD *thd, SJ_TMP_TABLE *sjtbl)
  if (error)
  {
    /* create_internal_tmp_table_from_heap will generate error if needed */
-    if (sjtbl->tmp_table->file->is_fatal_error(error, HA_CHECK_DUP) &&
+    if (!sjtbl->tmp_table->file->is_fatal_error(error, HA_CHECK_DUP))
-        create_internal_tmp_table_from_heap(thd, sjtbl->tmp_table,
+      DBUG_RETURN(1); /* Duplicate */
+    if (create_internal_tmp_table_from_heap(thd, sjtbl->tmp_table,
                                            sjtbl->start_recinfo,
                                            &sjtbl->recinfo, error, 1))
      DBUG_RETURN(-1);
-    DBUG_RETURN(1);
  }
  DBUG_RETURN(0);
 }