diff options
| author | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 17:12:06 +0200 |
| commit | 08b3e79e409c79e09751ac8fd684898e390737d3 (patch) | |
| tree | 6fc367f3ae7c8968bf852d78cccec9f8c03ab417 /sql/log_event.cc | |
| parent | c5d4d50ab703d9b3cb087ea5e721baed6fbdab8c (diff) | |
| parent | 248e44945161ec6a84072c8684447aeb702e5bd7 (diff) | |
| download | mariadb-git-08b3e79e409c79e09751ac8fd684898e390737d3.tar.gz | |
Merge with global tree
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/examples/ha_archive.cc:
Merge with global tree
(Use my changes)
sql/sql_parse.cc:
Remove 'tmp' fix to be able to run tests
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index fa193df40a2..7f92159208b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -673,7 +673,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file, #endif { DBUG_ENTER("Log_event::read_log_event(IO_CACHE *, Format_description_log_event *"); - DBUG_ASSERT(description_event); + DBUG_ASSERT(description_event != 0); char head[LOG_EVENT_MINIMAL_HEADER_LEN]; /* First we only want to read at most LOG_EVENT_MINIMAL_HEADER_LEN, just to @@ -741,7 +741,7 @@ err: UNLOCK_MUTEX; if (!res) { - DBUG_ASSERT(error); + DBUG_ASSERT(error != 0); sql_print_error("Error in Log_event::read_log_event(): " "'%s', data_len: %d, event_type: %d", error,data_len,head[EVENT_TYPE_OFFSET]); @@ -772,7 +772,7 @@ Log_event* Log_event::read_log_event(const char* buf, uint event_len, { Log_event* ev; DBUG_ENTER("Log_event::read_log_event(char*,...)"); - DBUG_ASSERT(description_event); + DBUG_ASSERT(description_event != 0); DBUG_PRINT("info", ("binlog_version: %d", description_event->binlog_version)); if (event_len < EVENT_LEN_OFFSET || (uint) event_len != uint4korr(buf+EVENT_LEN_OFFSET)) |