database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge work:/home/bk/mysql

Browse Source 
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
parent 2db1639c90 5d1d3b31a6
commit dbd04cab86
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.cc
View File

@ -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;

2
sql/sql_yacc.yy
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 */ {}