diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-05 17:33:38 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-05 17:33:38 +0300 |
| commit | 64d11bb395348ec002760d5354fbec0e373db593 (patch) | |
| tree | 2f66999790d27b10bd1ddb8bdc47741a04c5c502 /sql/handler.cc | |
| parent | ad5e39bf12b7aeefbc313e464a1349541a7b15c5 (diff) | |
| parent | a3afb2bcbea96d4c5a326204151fb63cd0411aec (diff) | |
| download | mariadb-git-64d11bb395348ec002760d5354fbec0e373db593.tar.gz | |
Merge with 4.0.13
BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index db1857e938c..493959f0473 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -218,8 +218,12 @@ void ha_close_connection(THD* thd) } /* - This is used to commit or rollback a single statement depending - on the value of error + This is used to commit or rollback a single statement depending on the value + of error. Note that if the autocommit is on, then the following call inside + InnoDB will commit or rollback the whole transaction (= the statement). The + autocommit mechanism built into InnoDB is based on counting locks, but if + the user has used LOCK TABLES then that mechanism does not know to do the + commit. */ int ha_autocommit_or_rollback(THD *thd, int error) |