database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

ha_berkeley.cc fixed misleading comment

Browse Source 
sql_parse.cc	typo when checking for autocommit


sql/sql_parse.cc:
  typo when checking for autocommit
sql/ha_berkeley.cc:
  fixed misleading comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2000-11-15 08:34:18 +01:00
parent dcf4e49369
commit 1ba95db25f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -6,3 +6,4 @@ sasha@work.mysql.com
serg@serg.mysql.com serg@serg.mysql.com
yfaktoro@nslinuxw2.bedford.progress.com yfaktoro@nslinuxw2.bedford.progress.com
mwagner@evoq.home.mwagner.org mwagner@evoq.home.mwagner.org
tim@work.mysql.com

5
sql/ha_berkeley.cc
View File

@ -1374,8 +1374,9 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
&& !(thd->options & OPTION_BEGIN)) && !(thd->options & OPTION_BEGIN))
{ {
/* /*
F_UNLOCK is done without a transaction commit / rollback. This F_UNLOCK is done without a transaction commit / rollback.
means that something went wrong. This happens if the thread didn't update any rows or if
something went wrong during an update.
We can in this case silenty abort the transaction. We can in this case silenty abort the transaction.
*/ */
DBUG_PRINT("trans",("aborting transaction")); DBUG_PRINT("trans",("aborting transaction"));

2
sql/sql_parse.cc
View File

@ -1539,7 +1539,7 @@ mysql_execute_command(void)
/* Check if auto_commit mode changed */ /* Check if auto_commit mode changed */
if ((org_options ^ lex->options) & OPTION_AUTO_COMMIT) if ((org_options ^ lex->options) & OPTION_AUTO_COMMIT)
{ {
if (!org_options & OPTION_AUTO_COMMIT) if (!(org_options & OPTION_AUTO_COMMIT))
{ {
/* We changed to auto_commit mode */ /* We changed to auto_commit mode */
thd->options&= ~OPTION_BEGIN; thd->options&= ~OPTION_BEGIN;