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 /sql/sql_yacc.yy | |
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
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 5 insertions, 5 deletions
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; /* |