Commit 91bf188b authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merge work:/home/bk/mysql 

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

sql/sql_parse.cc

+1 −0
Original line number Diff line number Diff line
@@ -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;

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -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 */ {}