The following merges changed sql_yacc.yy but not sql_yacc_ora.yy:
commit 862af4d2
commit df563e0c

Apply the same fixes to the other parser.