diff options
| author | unknown <tim@work.mysql.com> | 2000-11-15 08:34:18 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2000-11-15 08:34:18 +0100 |
| commit | 1ba95db25fabf89d58454d3c6cb733eb67700bcc (patch) | |
| tree | 20b17e06f53275c7f60c112f514c648e247fcf85 /sql | |
| parent | dcf4e49369d91b78ab73b9de038d2729afb3a2a6 (diff) | |
| download | mariadb-git-1ba95db25fabf89d58454d3c6cb733eb67700bcc.tar.gz | |
ha_berkeley.cc fixed misleading comment
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_berkeley.cc | 5 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 6cf97f16bb8..7b00720aaef 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1374,8 +1374,9 @@ int ha_berkeley::external_lock(THD *thd, int lock_type) && !(thd->options & OPTION_BEGIN)) { /* - F_UNLOCK is done without a transaction commit / rollback. This - means that something went wrong. + F_UNLOCK is done without a transaction commit / rollback. + 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. */ DBUG_PRINT("trans",("aborting transaction")); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 066885ef30a..00fac25ea15 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1539,7 +1539,7 @@ mysql_execute_command(void) /* Check if auto_commit mode changed */ 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 */ thd->options&= ~OPTION_BEGIN; |