summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2002-12-02 20:38:00 +0100
committerserg@serg.mysql.com <>2002-12-02 20:38:00 +0100
commit2320923a7ba43cab44ca350f61d8b7b0ddc3a919 (patch)
treedef5561a631f2faec95f4e40d65e292ef8067f19 /sql/sql_yacc.yy
parent82eb69a4a2bf17c28765609688f43b3bf8deedf5 (diff)
downloadmariadb-git-2320923a7ba43cab44ca350f61d8b7b0ddc3a919.tar.gz
INSERT ... ON DUPLICATE KEY UPDATE ...
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 13836902736..ef3b9002114 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1459,7 +1459,7 @@ alter_list_item:
lex->simple_alter=0;
}
| RENAME opt_to table_ident
- {
+ {
LEX *lex=Lex;
lex->select_lex.db=$3->db.str;
lex->name= $3->table.str;
@@ -3045,7 +3045,7 @@ expr_or_default:
opt_insert_update:
/* empty */
- | ON DUPLICATE KEY_SYM UPDATE_SYM SET update_list
+ | ON DUPLICATE
{ /* for simplisity, let's forget about
INSERT ... SELECT ... UPDATE
for a moment */
@@ -3055,6 +3055,7 @@ opt_insert_update:
YYABORT;
}
}
+ KEY_SYM UPDATE_SYM SET update_list
;
/* Update rows in a table */