Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/usr/home/bar/mysql-5.0

sql/sp_head.h

@@ -470,11 +470,10 @@ class sp_instr_set_trigger_field : public sp_instr
 
 public:
 
-  sp_instr_set_trigger_field(Name_resolution_context *context_arg,
-                             uint ip, sp_pcontext *ctx,
+  sp_instr_set_trigger_field(uint ip, sp_pcontext *ctx,
                              Item_trigger_field *trg_fld, Item *val)
     : sp_instr(ip, ctx),
-      trigger_field(context_arg, trg_fld),
+      trigger_field(trg_fld),
       value(val)
   {}
 

sql/sql_lex.cc

@@ -1936,7 +1936,7 @@ void st_lex::link_first_table_back(TABLE_LIST *first,
     {
       first->next_local= (TABLE_LIST*) select_lex.table_list.first;
       select_lex.table_list.first=
-        (byte*) select_lex.context.table_list= first;
+        (byte*) (select_lex.context.table_list= first);
       select_lex.table_list.elements++;	//safety
     }
   }

sql/sql_yacc.yy

@@ -7743,13 +7743,13 @@ sys_option_value:
               it= new Item_null();
             }
 
-            if (!(trg_fld= new Item_trigger_field(&lex->current_select->context,
+            if (!(trg_fld= new Item_trigger_field(&lex->current_select->
+                                                  context,
                                                   Item_trigger_field::NEW_ROW,
                                                   $2.base_name.str)) ||
-                !(i= new sp_instr_set_trigger_field(
-                           &lex->current_select->context,
-                           lex->sphead->instructions(), lex->spcont,
-                           trg_fld, it)))
+                !(i= new sp_instr_set_trigger_field(lex->sphead->
+                                                    instructions(),
+                                                    lex->spcont, trg_fld, it)))
               YYABORT;
 
             /*