Commit 497b8865 authored by unknown's avatar unknown

fix bugs found by gcc 3.4 compiler


sql/sp_head.h:
  removed unused parameter
sql/sql_lex.cc:
  make correct operation order
sql/sql_yacc.yy:
  removed unused parameter
parent 8e08a14b
...@@ -470,11 +470,10 @@ class sp_instr_set_trigger_field : public sp_instr ...@@ -470,11 +470,10 @@ class sp_instr_set_trigger_field : public sp_instr
public: public:
sp_instr_set_trigger_field(Name_resolution_context *context_arg, sp_instr_set_trigger_field(uint ip, sp_pcontext *ctx,
uint ip, sp_pcontext *ctx,
Item_trigger_field *trg_fld, Item *val) Item_trigger_field *trg_fld, Item *val)
: sp_instr(ip, ctx), : sp_instr(ip, ctx),
trigger_field(context_arg, trg_fld), trigger_field(trg_fld),
value(val) value(val)
{} {}
......
...@@ -1936,7 +1936,7 @@ void st_lex::link_first_table_back(TABLE_LIST *first, ...@@ -1936,7 +1936,7 @@ void st_lex::link_first_table_back(TABLE_LIST *first,
{ {
first->next_local= (TABLE_LIST*) select_lex.table_list.first; first->next_local= (TABLE_LIST*) select_lex.table_list.first;
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 select_lex.table_list.elements++; //safety
} }
} }
......
...@@ -7743,13 +7743,13 @@ sys_option_value: ...@@ -7743,13 +7743,13 @@ sys_option_value:
it= new Item_null(); 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, Item_trigger_field::NEW_ROW,
$2.base_name.str)) || $2.base_name.str)) ||
!(i= new sp_instr_set_trigger_field( !(i= new sp_instr_set_trigger_field(lex->sphead->
&lex->current_select->context, instructions(),
lex->sphead->instructions(), lex->spcont, lex->spcont, trg_fld, it)))
trg_fld, it)))
YYABORT; YYABORT;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment