diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-04 19:53:07 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-04 19:53:07 +0300 |
| commit | a1b609f010fdf35023d5b8605ec3303b7a8e109e (patch) | |
| tree | fc5ab2eadc5a970a6c596cf77cbf58080643623c /sql/log.cc | |
| parent | b02870d6ecf9454a18ba3a96c9b23624c6db9e5c (diff) | |
| parent | 4099872e2c5be2657307a51684690f9ec5c179a0 (diff) | |
| download | mariadb-git-a1b609f010fdf35023d5b8605ec3303b7a8e109e.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 51540b82827..f352a38c393 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1855,7 +1855,9 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) if (commit_event->write(&log_file)) goto err; +#ifndef DBUG_OFF DBUG_skip_commit: +#endif if (flush_and_sync()) goto err; DBUG_EXECUTE_IF("half_binlogged_transaction", abort();); |