diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-04-23 11:06:26 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-04-23 11:06:26 +0500 |
| commit | 68dc7a1376cdd481e3879b7c86c4adeb32787014 (patch) | |
| tree | a2ecc8aded425fd30407dc717fe1b6a7e4ffa81b /sql/sql_select.cc | |
| parent | 14177de7508c0cbeb2f82aa8c6032c9c0ccbb6e9 (diff) | |
| parent | dee04cb564df421641f5da5401658e9a588743a0 (diff) | |
| download | mariadb-git-68dc7a1376cdd481e3879b7c86c4adeb32787014.tar.gz | |
Merge host.loc:/home/uchum/work/5.0-bugteam
into host.loc:/home/uchum/work/5.1-bugteam
mysql-test/r/ctype_gbk.result:
Auto merged
mysql-test/r/subselect3.result:
Auto merged
mysql-test/t/subselect3.test:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Merge with 5.0-bugteam (bug#35993).
strings/ctype-gbk.c:
Merge with 5.0-bugteam (bug#35993).
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 164edacc932..3353b7c8a80 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -846,6 +846,7 @@ JOIN::optimize() "Impossible HAVING" : "Impossible WHERE")); zero_result_cause= having_value == Item::COND_FALSE ? "Impossible HAVING" : "Impossible WHERE"; + tables= 0; error= 0; DBUG_RETURN(0); } |