diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 22:35:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 22:35:59 +0100 |
| commit | ab3604989c826aeda3fed147db64756a66361fb3 (patch) | |
| tree | 7b0e06b600e210e9597267747a9552e2d7304189 /sql/slave.cc | |
| parent | 38c91c067ba36e1bdc11ded707db9b9f0c84b871 (diff) | |
| download | mariadb-git-ab3604989c826aeda3fed147db64756a66361fb3.tar.gz | |
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
fix the code to compile with clang. fix warnings too.
include/probes_mysql_nodtrace.h:
clang++ doesn't like numeric _constants_ being used in ||
(it suspects that the intention was | ). Boolean constants are ok.
sql/hostname.cc:
only used in DBUG_ASSERT
sql/item.cc:
str_to_time and str_to_datetime return bool, not MYSQL_TIMESTAMP_xxx
sql/item_func.cc:
str_to_datetime_with_warn() returns bool, not MYSQL_TIMESTAMP_xxx
storage/cassandra/CMakeLists.txt:
CMAKE_CXX_FLAGS can be empty
storage/connect/odbconn.cpp:
HWND is void*
storage/connect/user_connect.h:
deprecated on FreeBSD and unused anyway
storage/connect/value.cpp:
bad characters inside. unused.
storage/spider/spd_trx.cc:
clang++ warns that memset will also overwrite vtbl. it might be as well a good idea,
as it asserts that the object will only be used as a storage.
silence the warning.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 2b584365828..0912d77e070 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -6005,10 +6005,9 @@ static Log_event* next_event(rpl_group_info *rgi, ulonglong *event_size) IO_CACHE* cur_log = rli->cur_log; mysql_mutex_t *log_lock = rli->relay_log.get_log_lock(); const char* errmsg=0; - THD *thd = rgi->thd; DBUG_ENTER("next_event"); - DBUG_ASSERT(thd != 0 && thd == rli->sql_driver_thd); + DBUG_ASSERT(rgi->thd != 0 && rgi->thd == rli->sql_driver_thd); *event_size= 0; #ifndef DBUG_OFF |