From 4a1dec3dfbf750dab7fcd6a5c6785c28b96a3c65 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Jun 2002 22:05:08 +0300 Subject: [PATCH] post-merged fixing --- sql/sql_parse.cc | 4 ++-- sql/sql_select.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 621f1d60a95..61a7f5e0ae5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1809,7 +1809,7 @@ mysql_execute_command(void) tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege); if ((res=open_and_lock_tables(thd,tables))) break; - thd->select_limit=HA_POS_ERROR; + unit->select_limit_cnt= HA_POS_ERROR; if (!setup_fields(thd,tables,select_lex->item_list,1,0,0) && !setup_fields(thd,tables,lex->value_list,0,0,0) && ! thd->fatal_error && (result=new multi_update(thd,tables,select_lex->item_list,lex->duplicates, @@ -2776,7 +2776,7 @@ void mysql_init_multi_delete(LEX *lex) { lex->sql_command= SQLCOM_DELETE_MULTI; mysql_init_select(lex); - lex->select->select_limit= lex->select->master_union()->select_limit_cnt= + lex->select->select_limit= lex->select->master_unit()->select_limit_cnt= HA_POS_ERROR; lex->auxilliary_table_list= lex->select_lex.table_list; lex->select->init_query(); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7e5130e93ab..d4f6504ec32 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2480,7 +2480,7 @@ make_simple_join(JOIN *join,TABLE *tmp_table) join->send_records=(ha_rows) 0; join->group=0; join->do_send_rows = 1; - join->row_limit=join->thd->select_limit; + join->row_limit=join->unit->select_limit_cnt; join_tab->cache.buff=0; /* No cacheing */ join_tab->table=tmp_table; @@ -7119,7 +7119,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order, /* Don't log this into the slow query log */ select_lex->options&= ~(QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED); - thd->offset_limit=0; + join->unit->offset_limit_cnt= 0; if (thd->lex.select == select_lex) { field_list.push_back(new Item_empty_string("table",NAME_LEN));