diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-04 18:20:57 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-04 18:20:57 +0300 |
| commit | dee0ea4b6c93ab7550e39293655f1b3b65cc3b7c (patch) | |
| tree | 6a14638a32646753fac39b1c2811ab785c0f0f3e /sql/log.cc | |
| parent | ee6e983c5ce9a33a29d5b30391660c67c3de6653 (diff) | |
| download | mariadb-git-dee0ea4b6c93ab7550e39293655f1b3b65cc3b7c.tar.gz | |
Some fixes including implicit declaration of a function,
using wrong type in assignment etc.
cmd-line-utils/readline/complete.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/display.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
cmd-line-utils/readline/mbutil.c:
Fixed problem with implicitely defining wcwidth() in case when
compiling with icc.
server-tools/instance-manager/protocol.cc:
Fixed some types from int to char. Made ERROR_PACKET_CODE
static global variable in this file.
sql/log.cc:
Removed warning of unused goto when not in debug mode.
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 6e372938752..8d9185a8850 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1850,7 +1850,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();); |