diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2000-10-30 21:50:43 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2000-10-30 21:50:43 -0500 |
| commit | dbd04cab863de2272e3d31ff8e0e74cd09aa92c7 (patch) | |
| tree | fc6977c901da15bbd77a8bc9d622b8a0f7208135 /sql/sql_yacc.yy | |
| parent | 2db1639c904630c2ad8369fb2ae808be5395980f (diff) | |
| parent | 5d1d3b31a6facd78e8e0687328f429a6485d6ee7 (diff) | |
| download | mariadb-git-dbd04cab863de2272e3d31ff8e0e74cd09aa92c7.tar.gz | |
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
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c647ac8a192..f7497d605cc 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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 */ {} |