mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2001-02-23 16:37:49 +02:00
commit 9ab26a65bb
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -1 +1,2 @@
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
heikki@donna.mysql.fi

6
sql/ha_innobase.cc
View file

@ -2031,6 +2031,12 @@ ha_innobase::external_lock(
trx->n_mysql_tables_in_use++; trx->n_mysql_tables_in_use++;
} else { } else {
trx->n_mysql_tables_in_use--; 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); DBUG_RETURN(error);