Commit 58b37627 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 fddab55d 38c8be9c

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
sasha@mysql.sashanet.com

sasha@work.mysql.com

tim@threads.polyesthetic.msg

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -5321,6 +5321,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:







































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 */ {}