caching of queries with isammerge tables forbiden using general way

SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update

1 files changed, 2 insertions, 4 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 19a6941fe32..e545e35921a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1023,6 +1023,7 @@ void st_select_lex::init_query()
   ref_pointer_array= 0;
   select_n_having_items= 0;
   prep_where= 0;
+  explicit_limit= 0;
 }
 
 void st_select_lex::init_select()
@@ -1616,10 +1617,7 @@ void st_select_lex::print_limit(THD *thd, String *str)
   if (!thd)
     thd= current_thd;
 
-  if ((select_limit != thd->variables.select_limit &&
-       this == &thd->lex->select_lex) ||
-      (select_limit != HA_POS_ERROR && this != &thd->lex->select_lex) ||
-      offset_limit != 0L)
+  if (explicit_limit)
   {
     str->append(" limit ", 7);
     char buff[20];