summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorramil@mysql.com <>2005-03-01 12:31:05 +0400
committerramil@mysql.com <>2005-03-01 12:31:05 +0400
commit8f909069618fd998d7fb0fc76cbf671d9e8b880c (patch)
tree0e3872a6a5d73f06e8505389ccd20cfe6b1ec7f5 /sql/sql_select.cc
parentc896fcb4834ef8f1e3578d4025303261a8a4cadf (diff)
parenta6ad8a4d0f6d405919c1968450ff64b1dbded38d (diff)
downloadmariadb-git-8f909069618fd998d7fb0fc76cbf671d9e8b880c.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b6089
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 533a070de23..807de2e5a6c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -579,7 +579,7 @@ JOIN::optimize()
!(select_options & SELECT_DESCRIBE))
{ /* purecov: inspected */
my_message(ER_TOO_BIG_SELECT, ER(ER_TOO_BIG_SELECT), MYF(0));
- error= 1; /* purecov: inspected */
+ error= -1;
DBUG_RETURN(1);
}
if (const_tables && !thd->locked_tables &&