1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -1,2 +1,3 @@
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
sasha@work.mysql.com sasha@work.mysql.com
tim@threads.polyesthetic.msg

4
Docs/manual.texi
View File

@ -5321,6 +5321,10 @@ Change into the top-level directory of the unpacked distribution:
shell> cd mysql-VERSION shell> cd mysql-VERSION
@end example @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 @item
Configure the release and compile everything: Configure the release and compile everything:

1
sql/sql_parse.cc
View File

@ -1716,6 +1716,7 @@ mysql_execute_command(void)
case SQLCOM_BEGIN: case SQLCOM_BEGIN:
thd->options|= OPTION_BEGIN; thd->options|= OPTION_BEGIN;
thd->server_status|= SERVER_STATUS_IN_TRANS; thd->server_status|= SERVER_STATUS_IN_TRANS;
send_ok(&thd->net);
break; break;
case SQLCOM_COMMIT: case SQLCOM_COMMIT:
thd->options&= ~OPTION_BEGIN; thd->options&= ~OPTION_BEGIN;

2
sql/sql_yacc.yy
View File

@ -2851,7 +2851,7 @@ grant_option:
| WITH GRANT OPTION { Lex->grant |= GRANT_ACL;} | WITH GRANT OPTION { Lex->grant |= GRANT_ACL;}
begin: begin:
BEGIN_SYM { Lex->sql_command = SQLCOM_COMMIT;} opt_work BEGIN_SYM { Lex->sql_command = SQLCOM_BEGIN;} opt_work
opt_work: opt_work:
/* empty */ {} /* empty */ {}