summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-12-23 14:56:41 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-12-23 14:56:41 +0200
commit00c6129c10fedf9b31f955cd03b3666ba7c42097 (patch)
tree0d17959f74c5e641324e58b4cd2581dcd7a8fd17 /sql/sql_select.cc
parenta3c5ad17472db208c676bbcb59a41fd7fe12b078 (diff)
downloadmariadb-git-00c6129c10fedf9b31f955cd03b3666ba7c42097.tar.gz
many bug fixes
sql/log.cc: Fix for a bug in query logging ... sql/mysqld.cc: Fix for a bug with max_allowed_packt sql/sql_select.cc: Fix for a bug which is caused when a single table is scanned by entire index and WHERE clause is so broad that JOIN type is JT_ALL.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 3596fdc0c05..64a0f9e6df1 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2328,7 +2328,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
if ((tab->keys & ~ tab->const_keys && i > 0) ||
tab->const_keys && i == join->const_tables &&
- join->thd->select_limit < join->best_positions[i].records_read)
+ join->thd->select_limit < join->best_positions[i].records_read &&
+ join->tables > 1)
{
/* Join with outer join condition */
COND *orig_cond=sel->cond;