diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-17 16:48:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-17 16:48:26 +0100 |
| commit | 646d79050ce0e35cc4aa6de21d225b2004055ddf (patch) | |
| tree | ef951d8a4b6bcab05e6444f67f8ae396c3129a7a /sql/sql_select.cc | |
| parent | a171aa693e7f1c28ce67761621d032704fabde70 (diff) | |
| download | mariadb-git-646d79050ce0e35cc4aa6de21d225b2004055ddf.tar.gz | |
Bug #14634 Running out of diskspace on tmpdir returns an inappropriate error
sql/sql_select.cc:
Backport from 5.0, catch the new errno that is returned
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5e29c98e2c8..5c5216b8561 100644 --- 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; - error= -1; + new_errno= tmp; } if ((tmp=table->file->ha_index_or_rnd_end())) { DBUG_PRINT("error",("ha_index_or_rnd_end() failed")); - my_errno= tmp; - error= -1; + new_errno= tmp; } - if (error == -1) - table->file->print_error(my_errno,MYF(0)); + if (new_errno) + table->file->print_error(new_errno,MYF(0)); } #ifndef DBUG_OFF if (error) |