mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge work:/home/bk/mysql

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


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2000-11-06 11:13:40 -05:00
commit 6cffc526b5
4 changed files with 7 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 */ {}