Commit 9ac867fd authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

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

into donna.mysql.fi:/home/heikki/mysql
parents 34de7682 1af17f8d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
mwagner@evoq.mwagner.org

heikki@donna.mysql.fi

sql/ha_innobase.cc

+6 −0
Original line number Diff line number Diff line
@@ -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);