summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-07-17 09:46:14 -0700
committerunknown <igor@rurik.mysql.com>2005-07-17 09:46:14 -0700
commit6a88fa48ae2568aadf8513060a88c88b65c3f7cc (patch)
tree1e07c203ef28201cbcf2715f936d037466b46e03 /sql/sql_select.cc
parent89519b677e5fb9082e388515def51e47ae899f0b (diff)
downloadmariadb-git-6a88fa48ae2568aadf8513060a88c88b65c3f7cc.tar.gz
select.result, select.test:
Added a test case for bug #11745. sql_select.cc: Fixed bug # 11745. Added support of where clause for queries with FROM DUAL. sql_yacc.yy: Fixed bug # 11745. Added optional where clause for queries with FROM DUAL. sql/sql_yacc.yy: Fixed bug # 11745. Added optional where clause for queries with FROM DUAL. sql/sql_select.cc: Fixed bug # 11745. Added support of where clause for queries with FROM DUAL. mysql-test/t/select.test: Added a test case for bug #11745. mysql-test/r/select.result: Added a test case for bug #11745.
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 a70fa1c8d5e..5b4eab36dd2 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1072,7 +1072,7 @@ JOIN::exec()
else
{
result->send_fields(fields_list,1);
- if (!having || having->val_int())
+ if (cond_value != Item::COND_FALSE && (!having || having->val_int()))
{
if (do_send_rows && (procedure ? (procedure->send_row(fields_list) ||
procedure->end_of_records())