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 | |
| 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
| -rw-r--r-- | sql/sql_parse.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b22c876d4fe..3f94f89f366 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1716,6 +1716,7 @@ mysql_execute_command(void) case SQLCOM_BEGIN: thd->options|= OPTION_BEGIN; thd->server_status|= SERVER_STATUS_IN_TRANS; + send_ok(&thd->net); break; case SQLCOM_COMMIT: thd->options&= ~OPTION_BEGIN; 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 */ {} |