From 5d1d3b31a6facd78e8e0687328f429a6485d6ee7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Oct 2000 21:50:15 -0500 Subject: [PATCH 1/2] sql_parse.cc add send_ok() for BEGIN WORK sql_yacc.yy SQLCOM_COMMIT => SQLCOM_BEGIN for BEGIN_SYM sql/sql_yacc.yy: SQLCOM_COMMIT => SQLCOM_BEGIN for BEGIN_SYM sql/sql_parse.cc: add send_ok() for BEGIN WORK --- sql/sql_parse.cc | 1 + sql/sql_yacc.yy | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 359ed495a83..a8f559790cb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1697,6 +1697,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 4b404081676..a1aadb82135 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2838,7 +2838,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 */ {} From 277c61a97b656ff4fffc7fcacb0c1109caa95518 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Oct 2000 21:56:53 -0500 Subject: [PATCH 2/2] manual.texi you can only build from top directory Docs/manual.texi: you can only build from top directory --- Docs/manual.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Docs/manual.texi b/Docs/manual.texi index eedf6d69355..3a1b2fdcf0e 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -5282,6 +5282,10 @@ Change into the top-level directory of the unpacked distribution: shell> cd mysql-VERSION @end example +Note that currently you must configure and build @strong{MySQL} from +this top-level directory. You can not build it in a different +directory. + @item Configure the release and compile everything: