Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error

c4ddf677 · msvensson@neptunus.(none) · f353bec5 · c4ddf677
Commit c4ddf677 authored Jan 17, 2006 by msvensson@neptunus.(none)
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

sql/sql_select.cc sql/sql_select.cc +5 -7

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5942,21 +5942,19 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
  }
  if (table)
  {
-    int tmp;
+    int tmp, new_errno= 0;
    if ((tmp=table->file->extra(HA_EXTRA_NO_CACHE)))
    {
      DBUG_PRINT("error",("extra(HA_EXTRA_NO_CACHE) failed"));
-      my_errno= tmp;
+      new_errno= tmp;
-      error= -1;
    }
    if ((tmp=table->file->ha_index_or_rnd_end()))
    {
      DBUG_PRINT("error",("ha_index_or_rnd_end() failed"));
-      my_errno= tmp;
+      new_errno= tmp;
-      error= -1;
    }
-    if (error == -1)
+    if (new_errno)
-      table->file->print_error(my_errno,MYF(0));
+      table->file->print_error(new_errno,MYF(0));
  }
 #ifndef DBUG_OFF
  if (error)