summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-28 13:15:42 +0200
committerunknown <monty@mysql.com>2003-11-28 13:15:42 +0200
commit183b02a8ac6074775bd8c33f036eed3cf6597bbe (patch)
tree2b9c30b1998a9901e07de15a467cb8b312f2469f /sql
parent76bf7d2224287b40ecfd2bac62b2dd45561affb1 (diff)
downloadmariadb-git-183b02a8ac6074775bd8c33f036eed3cf6597bbe.tar.gz
Fix wrong last edit for last commit
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 3594b53436e..82ce688495a 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -608,7 +608,7 @@ JOIN::optimize()
!(select_options & SELECT_NO_UNLOCK))
{
TABLE **curr_table, **end;
- for (curr_table= table, end=cur_table + const_tables ;
+ for (curr_table= table, end=curr_table + const_tables ;
curr_table != end;
curr_table++)
{
@@ -1411,7 +1411,7 @@ JOIN::exec()
if (!(curr_table->select->cond=
new Item_cond_and(curr_table->select->cond, sort_table_cond)))
DBUG_VOID_RETURN;
- curr_table->select_cond= cur_table->select->cond;
+ curr_table->select_cond= curr_table->select->cond;
curr_table->select_cond->top_level_item();
DBUG_EXECUTE("where",print_where(curr_table->select->cond,
"select and having"););