1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00

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

This commit is contained in:
msvensson@neptunus.(none) 2006-01-17 16:48:26 +01:00
parent f353bec511
commit c4ddf67710

View File

@ -5942,21 +5942,19 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
} }
if (table) if (table)
{ {
int tmp; int tmp, new_errno= 0;
if ((tmp=table->file->extra(HA_EXTRA_NO_CACHE))) if ((tmp=table->file->extra(HA_EXTRA_NO_CACHE)))
{ {
DBUG_PRINT("error",("extra(HA_EXTRA_NO_CACHE) failed")); 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())) if ((tmp=table->file->ha_index_or_rnd_end()))
{ {
DBUG_PRINT("error",("ha_index_or_rnd_end() failed")); 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 #ifndef DBUG_OFF
if (error) if (error)