summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-05-03 08:47:34 +0300
committerunknown <monty@donna.mysql.fi>2001-05-03 08:47:34 +0300
commit203c3eeb4c0b451092cb0c1ab1115d0bd179c0e2 (patch)
treef11ba9d18c76c9324470cb8c32290a91b8d0e591 /Docs
parent0f716142902ea3209a57eae9fa18ca7de28a3da8 (diff)
parent10f869455fde6d87fb8194a356c029b72d3ba85d (diff)
downloadmariadb-git-203c3eeb4c0b451092cb0c1ab1115d0bd179c0e2.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi: Auto merged
Diffstat (limited to 'Docs')
-rw-r--r--Docs/manual.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 83f80733b2b..47a151795e4 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -22530,11 +22530,11 @@ non-transactional table will not change.
If you are using @code{BEGIN} or @code{SET AUTOCOMMIT=0}, you
should use the @strong{MySQL} binary log for backups instead of the
-old update log; The transaction is stored in the binary log
-in one chunk, during @code{COMMIT}, the to ensure and @code{ROLLBACK}:ed
-transactions are not stored. @xref{Binary log}.
+older update log. Transactions are stored in the binary log
+in one chunk, upon @code{COMMIT}, to ensure that transactions which are
+rolled back are not stored. @xref{Binary log}.
-The following commands automatically ends an transaction (as if you had done
+The following commands automatically end a transaction (as if you had done
a @code{COMMIT} before executing the command):
@multitable @columnfractions .33 .33 .33