summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2003-01-04 21:02:58 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2003-01-04 21:02:58 +0200
commitb2c904ec671fe5425623025682b9b54786365845 (patch)
treea1256a9174e4ea3ddf6bc05f527673dc9c0c70e6 /sql/sql_select.cc
parent4c239771855b5f1866d20ade00d94f44b9233d91 (diff)
downloadmariadb-git-b2c904ec671fe5425623025682b9b54786365845.tar.gz
Fixing that 3.23 API / clients do not disconnect if a large
packet is issued. BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: Delete: libmysql/net.c sql/sql_select.cc: reversing a fix, but we shall yet see about this one ...
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 64a0f9e6df1..3596fdc0c05 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2328,8 +2328,7 @@ 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->tables > 1)
+ join->thd->select_limit < join->best_positions[i].records_read)
{
/* Join with outer join condition */
COND *orig_cond=sel->cond;