diff options
| author | stewart@willster.(none) <> | 2006-10-18 18:51:39 +1000 |
|---|---|---|
| committer | stewart@willster.(none) <> | 2006-10-18 18:51:39 +1000 |
| commit | 71636edc16320bf8c68b21d776086d8045ec63ad (patch) | |
| tree | 158cd8baa75df0668f66387c30ec45326aad4cf2 /sql/sql_union.cc | |
| parent | 73831dad5019e53f5e92ee28d93329ea125d043e (diff) | |
| parent | fff4559edd704dd68b79e045f03f0308f640e20a (diff) | |
| download | mariadb-git-71636edc16320bf8c68b21d776086d8045ec63ad.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 3e6a3944093..cfaf21fa957 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -496,7 +496,12 @@ bool st_select_lex_unit::exec() DBUG_RETURN(res); } /* Needed for the following test and for records_at_start in next loop */ - table->file->info(HA_STATUS_VARIABLE); + int error= table->file->info(HA_STATUS_VARIABLE); + if(error) + { + table->file->print_error(error, MYF(0)); + DBUG_RETURN(1); + } if (found_rows_for_union && !sl->braces && select_limit_cnt != HA_POS_ERROR) { |