Name resolution context added (BUG#6443)

include/my_bitmap.h:
  new bitmap operation
mysql-test/r/view.result:
  added warnings
  Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
mysql-test/t/view.test:
  Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
mysys/my_bitmap.c:
  new bitmap operation
sql/field.h:
  index of field in table added
sql/item.cc:
  Name resolution context added
  table list removed from fix_fields() arguments
sql/item.h:
  Name resolution context added
  table list removed from fix_fields() arguments
sql/item_cmpfunc.cc:
  table list removed from fix_fields() arguments
sql/item_cmpfunc.h:
  table list removed from fix_fields() arguments
sql/item_func.cc:
  table list removed from fix_fields() arguments
sql/item_func.h:
  table list removed from fix_fields() arguments
sql/item_row.cc:
  table list removed from fix_fields() arguments
sql/item_row.h:
  table list removed from fix_fields() arguments
sql/item_strfunc.cc:
  fixed server crash on NULL argument
sql/item_strfunc.h:
  table list removed from fix_fields() arguments
sql/item_subselect.cc:
  table list removed from fix_fields() arguments
sql/item_subselect.h:
  table list removed from fix_fields() arguments
sql/item_sum.cc:
  table list removed from fix_fields() arguments
sql/item_sum.h:
  table list removed from fix_fields() arguments
sql/item_timefunc.cc:
  table list removed from fix_fields() arguments
sql/item_timefunc.h:
  table list removed from fix_fields() arguments
sql/item_uniq.h:
  table list removed from fix_fields() arguments
sql/log_event.cc:
  Name resolution context added
sql/log_event.h:
  Name resolution context added
sql/mysql_priv.h:
  Name resolution context added
sql/set_var.cc:
  table list removed from fix_fields() arguments
sql/share/errmsg.txt:
  new error message
sql/sp.cc:
  Name resolution context added
sql/sp_head.cc:
  table list removed from fix_fields() arguments
sql/sp_head.h:
  Name resolution context added
sql/sql_base.cc:
  table list removed from fix_fields() arguments
  Name resolution context added
sql/sql_class.cc:
  renamed variable
sql/sql_delete.cc:
  Name resolution context added
sql/sql_derived.cc:
  Name resolution context added
sql/sql_do.cc:
  table list removed from fix_fields() arguments
sql/sql_handler.cc:
  Name resolution context added
sql/sql_help.cc:
  Name resolution context added
sql/sql_insert.cc:
  Name resolution context added
  table list removed from fix_fields() arguments
sql/sql_lex.cc:
  Name resolution context added
sql/sql_lex.h:
  removed resolve mode (information stored into name resolution context)
sql/sql_load.cc:
  table list removed from fix_fields() arguments
sql/sql_olap.cc:
  Name resolution context added
sql/sql_parse.cc:
  Name resolution context added
sql/sql_prepare.cc:
  table list removed from fix_fields() arguments
sql/sql_select.cc:
  table list removed from fix_fields() arguments
sql/sql_show.cc:
  Name resolution context added
sql/sql_trigger.cc:
  table list removed from fix_fields() arguments
sql/sql_udf.h:
  table list removed from fix_fields() arguments
sql/sql_union.cc:
  Name resolution context added
sql/sql_update.cc:
  Name resolution context added
sql/sql_view.cc:
  Name resolution context added
sql/sql_view.h:
  table list removed from fix_fields() arguments
sql/sql_yacc.yy:
  Name resolution context added
sql/table.cc:
  Name resolution context added
  merged view processing moved
sql/table.h:
  merged view processing moved

1 files changed, 27 insertions, 23 deletions

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index c7587686ecd..ad1c9977e5b 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -130,7 +130,7 @@ Item_subselect::select_transformer(JOIN *join)
 }
 
 
-bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
+bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
 {
   char const *save_where= thd_param->where;
   bool res;
@@ -165,7 +165,7 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref)
       substitution= 0;
       thd->where= "checking transformed subquery";
       if (!(*ref)->fixed)
-	ret= (*ref)->fix_fields(thd, tables, ref);
+	ret= (*ref)->fix_fields(thd, ref);
       thd->where= save_where;
       return ret;
     }
@@ -833,7 +833,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
         reference, also Item_sum_(max|min) can't be fixed after creation, so
         we do not check item->fixed
       */
-      if (item->fix_fields(thd, join->tables_list, 0))
+      if (item->fix_fields(thd, 0))
 	DBUG_RETURN(RES_ERROR);
       /* we added aggregate function => we have to change statistic */
       count_field_types(&join->tmp_table_param, join->all_fields, 0);
@@ -862,7 +862,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
 
     thd->lex->current_select= up= current->return_after_parsing();
     //optimizer never use Item **ref => we can pass 0 as parameter
-    if (!optimizer || optimizer->fix_left(thd, up->get_table_list(), 0))
+    if (!optimizer || optimizer->fix_left(thd, 0))
     {
       thd->lex->current_select= current;
       DBUG_RETURN(RES_ERROR);
@@ -873,7 +873,8 @@ Item_in_subselect::single_value_transformer(JOIN *join,
       As far as  Item_ref_in_optimizer do not substitute itself on fix_fields
       we can use same item for all selects.
     */
-    expr= new Item_direct_ref((Item**)optimizer->get_cache(),
+    expr= new Item_direct_ref(&select_lex->context,
+                              (Item**)optimizer->get_cache(),
 			      (char *)"<no matter>",
 			      (char *)in_left_expr_name);
 
@@ -893,7 +894,8 @@ Item_in_subselect::single_value_transformer(JOIN *join,
   {
     bool tmp;
     Item *item= func->create(expr,
-                             new Item_ref_null_helper(this,
+                             new Item_ref_null_helper(&select_lex->context,
+                                                      this,
                                                       select_lex->
                                                       ref_pointer_array,
                                                       (char *)"<ref>",
@@ -913,7 +915,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
       we do not check join->having->fixed, because Item_and (from and_items)
       or comparison function (from func->create) can't be fixed after creation
     */
-    tmp= join->having->fix_fields(thd, join->tables_list, 0);
+    tmp= join->having->fix_fields(thd, 0);
     select_lex->having_fix_field= 0;
     if (tmp)
       DBUG_RETURN(RES_ERROR);
@@ -949,7 +951,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
           and_items) or comparison function (from func->create) can't be
           fixed after creation
         */
-	tmp= join->having->fix_fields(thd, join->tables_list, 0);
+	tmp= join->having->fix_fields(thd, 0);
         select_lex->having_fix_field= 0;
         if (tmp)
 	  DBUG_RETURN(RES_ERROR);
@@ -971,7 +973,7 @@ Item_in_subselect::single_value_transformer(JOIN *join,
         we do not check join->conds->fixed, because Item_and can't be fixed
         after creation
       */
-      if (join->conds->fix_fields(thd, join->tables_list, 0))
+      if (join->conds->fix_fields(thd, 0))
 	DBUG_RETURN(RES_ERROR);
     }
     else
@@ -983,22 +985,23 @@ Item_in_subselect::single_value_transformer(JOIN *join,
 	  comparison functions can't be changed during fix_fields()
 	  we can assign select_lex->having here, and pass 0 as last
 	  argument (reference) to fix_fields()
-	*/
-        item= func->create(expr, 
-		       new Item_null_helper(this, item,
-					    (char *)"<no matter>",
-					    (char *)"<result>"));
+        */
+        item= func->create(expr,
+                           new Item_null_helper(&select_lex->context,
+                                                this, item,
+                                                (char *)"<no matter>",
+                                                (char *)"<result>"));
 #ifdef CORRECT_BUT_TOO_SLOW_TO_BE_USABLE
         if (!abort_on_null && left_expr->maybe_null)
           item= new Item_cond_or(new Item_func_isnull(left_expr), item);
 #endif
-	select_lex->having= join->having= item;   
+	select_lex->having= join->having= item;
 	select_lex->having_fix_field= 1;
         /*
           we do not check join->having->fixed, because comparison function
           (from func->create) can't be fixed after creation
         */
-	tmp= join->having->fix_fields(thd, join->tables_list, 0);
+	tmp= join->having->fix_fields(thd, 0);
         select_lex->having_fix_field= 0;
         if (tmp)
 	  DBUG_RETURN(RES_ERROR);
@@ -1048,7 +1051,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
     SELECT_LEX *current= thd->lex->current_select, *up;
     thd->lex->current_select= up= current->return_after_parsing();
     //optimizer never use Item **ref => we can pass 0 as parameter
-    if (!optimizer || optimizer->fix_left(thd, up->get_table_list(), 0))
+    if (!optimizer || optimizer->fix_left(thd, 0))
     {
       thd->lex->current_select= current;
       DBUG_RETURN(RES_ERROR);
@@ -1071,12 +1074,14 @@ Item_in_subselect::row_value_transformer(JOIN *join)
       if (select_lex->ref_pointer_array[i]->
           check_cols(left_expr->el(i)->cols()))
         DBUG_RETURN(RES_ERROR);
-      Item *func= new Item_ref_null_helper(this,
+      Item *func= new Item_ref_null_helper(&select_lex->context,
+                                           this,
                                            select_lex->ref_pointer_array+i,
                                            (char *) "<no matter>",
                                            (char *) "<list ref>");
       func=
-	eq_creator.create(new Item_direct_ref((*optimizer->get_cache())->
+	eq_creator.create(new Item_direct_ref(&select_lex->context,
+                                              (*optimizer->get_cache())->
 					      addr(i),
 					      (char *)"<no matter>",
 					      (char *)in_left_expr_name),
@@ -1099,7 +1104,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
       join->having can't be fixed after creation, so we do not check
       join->having->fixed
     */
-    if (join->having->fix_fields(thd, join->tables_list, 0))
+    if (join->having->fix_fields(thd, 0))
     {
       select_lex->having_fix_field= 0;
       DBUG_RETURN(RES_ERROR);
@@ -1118,7 +1123,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
       join->conds can't be fixed after creation, so we do not check
       join->conds->fixed
     */
-    if (join->conds->fix_fields(thd, join->tables_list, 0))
+    if (join->conds->fix_fields(thd, 0))
       DBUG_RETURN(RES_ERROR);
   }
 
@@ -1189,8 +1194,7 @@ Item_in_subselect::select_in_like_transformer(JOIN *join, Comp_creator *func)
 
   thd->lex->current_select= up= current->return_after_parsing();
   result= (!left_expr->fixed &&
-           left_expr->fix_fields(thd, up->get_table_list(),
-                                 optimizer->arguments()));
+           left_expr->fix_fields(thd, optimizer->arguments()));
   /* fix_fields can change reference to left_expr, we need reassign it */
   left_expr= optimizer->arguments()[0];