diff options
| author | unknown <bar@mysql.com> | 2005-07-01 15:46:53 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-07-01 15:46:53 +0500 |
| commit | 8ec6c354ab113342e1b6a0375aec1e05da8e1988 (patch) | |
| tree | ff8425188a6d97f105ef41229cfcea3586fabc9c | |
| parent | 0e6a93ece30a2c5d145e51d5b8c3d0edb0066337 (diff) | |
| parent | 497b88652bf1529e62ae31c6c7151f5966435504 (diff) | |
| download | mariadb-git-8ec6c354ab113342e1b6a0375aec1e05da8e1988.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
| -rw-r--r-- | sql/sp_head.h | 5 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 08967bd9b4f..aaef5a3d50e 100644 --- a/sql/sp_head.h +++ b/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) {} diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 19578931d04..fe79b6dd035 100644 --- a/sql/sql_lex.cc +++ b/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 } } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c06bf8f7bf0..7a789cba035 100644 --- a/sql/sql_yacc.yy +++ b/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; /* |