summaryrefslogtreecommitdiff
path: root/sql/opt_sum.cc
diff options
context:
space:
mode:
authorstewart@willster.(none) <>2006-10-16 17:39:38 +1000
committerstewart@willster.(none) <>2006-10-16 17:39:38 +1000
commitc1903d967ae3a82818778c83dbed401144c48a2e (patch)
treed301ac33f253385737189c92d56fb5c94d4e76c9 /sql/opt_sum.cc
parent848f91799c8c09cf8813ebdead535d1a339ee179 (diff)
parent57a97f53bc13488d702ee3478aba83ffa4de5f7a (diff)
downloadmariadb-git-c1903d967ae3a82818778c83dbed401144c48a2e.tar.gz
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r--sql/opt_sum.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index d17c42bca38..fc4edabc4a4 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -134,7 +134,12 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
}
else
{
- tl->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+ error= tl->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+ if(error)
+ {
+ tl->table->file->print_error(error, MYF(0));
+ return error;
+ }
count*= tl->table->file->records;
}
}