diff options
| author | Mats Kindahl <mats@sun.com> | 2010-01-25 22:34:34 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-01-25 22:34:34 +0100 |
| commit | 51af6729f242aab68937ac73c3401d5c5a3983c2 (patch) | |
| tree | 98c95016fdd9a1b9a0d7cc7c8f6112c0a67ba939 /sql/sql_repl.cc | |
| parent | 8976595d827e7c29000d02b2f4431d4177d8e427 (diff) | |
| download | mariadb-git-51af6729f242aab68937ac73c3401d5c5a3983c2.tar.gz | |
Patch to eliminate warnings in mysql-next-mr-bugteam.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 00cc28e6213..1fb0fcaf6dd 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -828,11 +828,11 @@ impossible position"; { if (coord) { - DBUG_ASSERT(heartbeat_ts && heartbeat_period != LL(0)); + DBUG_ASSERT(heartbeat_ts && heartbeat_period != 0); set_timespec_nsec(*heartbeat_ts, heartbeat_period); } ret= mysql_bin_log.wait_for_update_bin_log(thd, heartbeat_ts); - DBUG_ASSERT(ret == 0 || heartbeat_period != LL(0) && coord != NULL); + DBUG_ASSERT(ret == 0 || (heartbeat_period != 0 && coord != NULL)); if (ret == ETIMEDOUT || ret == ETIME) { #ifndef DBUG_OFF |