Merge work.mysql.com:/home/bk/mysql

into donna.mysql.fi:/home/heikki/mysql

Merge work.mysql.com:/home/bk/mysql
into donna.mysql.fi:/home/heikki/mysql
9ac867fd · heikki@donna.mysql.fi · 34de7682 · 1af17f8d · 9ac867fd · 9ac867fd
Commit 9ac867fd authored Feb 23, 2001 by heikki@donna.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

sql/ha_innobase.cc sql/ha_innobase.cc +6 -0

No files found.
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
 mwagner@evoq.mwagner.org
+heikki@donna.mysql.fi
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -2031,6 +2031,12 @@ ha_innobase::external_lock(
 		trx->n_mysql_tables_in_use++;
 	} else {
 		trx->n_mysql_tables_in_use--;
+		if (trx->n_mysql_tables_in_use == 0 &&
+		    !(thd->options
+		      & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) {
+		  innobase_commit(thd, trx);
+		}
 	}
 	DBUG_RETURN(error);