bk commit into 5.0 tree (heikki:1.1953)

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
5.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1953 05/09/04 13:00:03 heikki@stripped +1 -0
  ha_innodb.cc:
    Better comments about auto-inc and SHOW TABLE STATUS

  sql/ha_innodb.cc
    1.253 05/09/04 12:59:41 heikki@stripped +5 -3
    Better comments about auto-inc and SHOW TABLE STATUS

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-5.0

--- 1.252/sql/ha_innodb.cc	2005-09-04 12:03:30 +03:00
+++ 1.253/sql/ha_innodb.cc	2005-09-04 12:59:41 +03:00
@@ -5543,7 +5543,7 @@
 
 		/* The following function call can the first time fail in
 		a lock wait timeout error because it reserves the auto-inc
-		lock on the table. If it fails, then someone has already inited
+		lock on the table. If it fails, then someone is already initing
 		the auto-inc counter, and the second call is guaranteed to
 		succeed. */
 
@@ -6893,9 +6893,11 @@
 
 func_exit_early:
 	/* Since MySQL does not seem to call autocommit after SHOW TABLE
-	STATUS (even if we would register the trx here), we must commit our
+	STATUS (even if we would register the trx here), we commit our
 	transaction here if it was started here. This is to eliminate a
-	dangling transaction. */
+	dangling transaction. If the user had AUTOCOMMIT=0, then SHOW
+	TABLE STATUS does leave a dangling transaction if the user does not
+	himself call COMMIT. */
 
 	if (trx_was_not_started) {