summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorstewart@willster.(none) <>2006-08-10 22:55:20 +0800
committerstewart@willster.(none) <>2006-08-10 22:55:20 +0800
commit9d2e6b8d23eb5e18a75a2fcb42a63abc97461c38 (patch)
treeeca32a4dab10c05bdc27fdb082459d63c173bbe4 /sql/sql_select.cc
parent50ae5b7989e6148bee11a718c72ebfdade2ccdc8 (diff)
downloadmariadb-git-9d2e6b8d23eb5e18a75a2fcb42a63abc97461c38.tar.gz
BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
allow handler::info to return an error code (that will be returned to the user)
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 605ef49bb07..03ce04a81a7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -537,6 +537,8 @@ JOIN::optimize()
{
if (res > 1)
{
+ thd->fatal_error();
+ error= res;
DBUG_RETURN(1);
}
if (res < 0)