summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-05-17 23:54:32 +0300
committerunknown <monty@mysql.com>2005-05-17 23:54:32 +0300
commit69381dfc4d90d7de16d1ef4596cb3e43b28026a1 (patch)
tree65d6d7e3f8053f8fde4511e98ac37db83f1a463d /sql/sql_yacc.yy
parent9ef623a11b8746af7c55ea7eab2bf0ec8a37345c (diff)
parentcfb02c341ed825794f10b781bdc2cbcc82cff797 (diff)
downloadmariadb-git-69381dfc4d90d7de16d1ef4596cb3e43b28026a1.tar.gz
Merge
sql/sql_base.cc: Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5bb8c6d8ff3..1b5a430477f 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3994,7 +3994,7 @@ select_options:
YYABORT;
}
}
- ;
+ ;
select_option_list:
select_option_list select_option