Bug #14230177 WITH CHECK OPTION NOT WORKING IF CLAUSE CONTAINS SUBQUERY

Guilhem Bichot · Guilhem Bichot · commit 5b04acdd506e · 2012-07-02T16:12:21.000+02:00
prevent semijoin on CHECK OPTION clause.
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -4742,15 +4742,13 @@ Item_cond::fix_fields(THD *thd, Item **ref)
   DBUG_ASSERT(fixed == 0);
   List_iterator<Item> li(list);
   Item *item;
-  st_select_lex::Resolve_place save_resolve=
-    thd->lex->current_select->resolve_place;
+  Switch_resolve_place SRP(&thd->lex->current_select->resolve_place,
+                           st_select_lex::RESOLVE_NONE,
+                           functype() != COND_AND_FUNC);
   uchar buff[sizeof(char*)];			// Max local vars in function
   used_tables_cache= 0;
   const_item_cache= true;
 
-  if (functype() != COND_AND_FUNC)
-    thd->lex->current_select->resolve_place= st_select_lex::RESOLVE_NONE;
-
   if (functype() == COND_AND_FUNC && abort_on_null)
     not_null_tables_cache= 0;
   else
@@ -4805,7 +4803,6 @@ Item_cond::fix_fields(THD *thd, Item **ref)
       maybe_null= true;
   }
   thd->lex->current_select->cond_count+= list.elements;
-  thd->lex->current_select->resolve_place= save_resolve;
   fix_length_and_dec();
   fixed= true;
   return false;
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -174,12 +174,10 @@ Item_func::fix_fields(THD *thd, Item **ref)
   Item **arg,**arg_end;
   uchar buff[STACK_BUFF_ALLOC];			// Max argument in function
 
-  st_select_lex::Resolve_place save_resolve= st_select_lex::RESOLVE_NONE;
-  if (thd->lex->current_select != NULL)
-  {
-    save_resolve= thd->lex->current_select->resolve_place;
-    thd->lex->current_select->resolve_place= st_select_lex::RESOLVE_NONE;
-  }
+  Switch_resolve_place SRP(thd->lex->current_select ?
+                           &thd->lex->current_select->resolve_place : NULL,
+                           st_select_lex::RESOLVE_NONE,
+                           thd->lex->current_select);
   used_tables_cache= get_initial_pseudo_tables();
   not_null_tables_cache= 0;
   const_item_cache=1;
@@ -234,8 +232,6 @@ Item_func::fix_fields(THD *thd, Item **ref)
   if (thd->is_error()) // An error inside fix_length_and_dec occured
     return TRUE;
   fixed= 1;
-  if (thd->lex->current_select != NULL)
-    thd->lex->current_select->resolve_place= save_resolve;
   return FALSE;
 }
 
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
@@ -1009,6 +1009,34 @@ inline bool st_select_lex_unit::is_union ()
     first_select()->next_select()->linkage == UNION_TYPE;
 }
 
+/// Utility RAII class to save/modify/restore a Resolve_place
+class Switch_resolve_place
+{
+public:
+  Switch_resolve_place(SELECT_LEX::Resolve_place *rp_ptr,
+                       SELECT_LEX::Resolve_place new_rp,
+                       bool apply)
+  {
+    if (apply)
+    {
+      rp= rp_ptr;
+      saved_rp= *rp;
+      *rp= new_rp;
+    }
+    else
+      rp= NULL;
+  }
+  ~Switch_resolve_place()
+  {
+    if (rp)
+      *rp= saved_rp;
+  }
+private:
+  SELECT_LEX::Resolve_place *rp;
+  SELECT_LEX::Resolve_place saved_rp;
+};
+
+
 typedef struct struct_slave_connection
 {
   char *user;
diff --git a/sql/table.cc b/sql/table.cc
@@ -3712,16 +3712,31 @@ bool TABLE_LIST::prep_where(THD *thd, Item **conds,
     }
   }
 
-  if (where)
+  if (where && !where_processed)
   {
-    if (!where->fixed && !where_processed && where->fix_fields(thd, &where))
-      DBUG_RETURN(TRUE);
+
+    if (!where->fixed)
+    {
+      /*
+        This WHERE will be included in check_option. If it contains a
+        subquery, fix_fields() may convert it to semijoin, making it
+        impossible to call val_int() on the Item[...]_subselect, preventing
+        evaluation of check_option when we insert/update/delete a row.
+        So we must forbid semijoin transformation in fix_fields():
+      */
+      Switch_resolve_place SRP(&thd->lex->current_select->resolve_place,
+                               st_select_lex::RESOLVE_NONE,
+                               effective_with_check != VIEW_CHECK_NONE);
+
+      if (where->fix_fields(thd, &where))
+        DBUG_RETURN(TRUE);
+    }
 
     /*
       check that it is not VIEW in which we insert with INSERT SELECT
       (in this case we can't add view WHERE condition to main SELECT_LEX)
     */
-    if (!no_where_clause && !where_processed)
+    if (!no_where_clause)
     {
       TABLE_LIST *tbl= this;
       Query_arena *arena= thd->stmt_arena, backup;
