bk commit into 5.0 tree (bell:1.1861)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1861 05/07/01 13:27:23 bell@stripped +3 -0
  fix bugs found by gcc 3.4 compiler

  sql/sql_yacc.yy
    1.403 05/07/01 13:26:29 bell@stripped +5 -5
    removed unused parameter

  sql/sql_lex.cc
    1.152 05/07/01 13:26:29 bell@stripped +1 -1
    make correct operation order

  sql/sp_head.h
    1.60 05/07/01 13:26:29 bell@stripped +2 -3
    removed unused parameter

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug8-5.0

--- 1.151/sql/sql_lex.cc	Fri Jul  1 07:05:36 2005
+++ 1.152/sql/sql_lex.cc	Fri Jul  1 13:26:29 2005
@@ -1936,7 +1936,7 @@
     {
       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
     }
   }

--- 1.402/sql/sql_yacc.yy	Fri Jul  1 07:05:36 2005
+++ 1.403/sql/sql_yacc.yy	Fri Jul  1 13:26:29 2005
@@ -7743,13 +7743,13 @@
               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;
 
             /*

--- 1.59/sql/sp_head.h	Fri Jul  1 07:05:35 2005
+++ 1.60/sql/sp_head.h	Fri Jul  1 13:26:29 2005
@@ -470,11 +470,10 @@
 
 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)
   {}