Merge work:/home/bk/mysql

into threads.polyesthetic.msg:/usr/local/src/my/work


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown 2000-10-30 21:50:43 -05:00
commit dbd04cab86
2 changed files with 2 additions and 1 deletions

View file

@ -2851,7 +2851,7 @@ grant_option:
| WITH GRANT OPTION { Lex->grant |= GRANT_ACL;}
begin:
BEGIN_SYM { Lex->sql_command = SQLCOM_COMMIT;} opt_work
BEGIN_SYM { Lex->sql_command = SQLCOM_BEGIN;} opt_work
opt_work:
/* empty */ {}