diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-12 15:10:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-15 22:23:10 +0200 |
| commit | 71b45032421fe47fceabe419c63e79c44794428d (patch) | |
| tree | c771e726ce4140b0798e7588034704801509e1ff /sql/log.cc | |
| parent | f9264280d68dcbca2f9312c7d8620b2bcc9d0694 (diff) | |
| download | mariadb-git-71b45032421fe47fceabe419c63e79c44794428d.tar.gz | |
MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning
remove useless checks
and a couple of others
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index e99eefe4970..b80d65e20db 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1294,7 +1294,7 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length, /* fill in user_host value: the format is "%s[%s] @ %s [%s]" */ user_host_len= (strxnmov(user_host_buff, MAX_USER_HOST_SIZE, - sctx->priv_user ? sctx->priv_user : "", "[", + sctx->priv_user, "[", sctx->user ? sctx->user : (thd->slave_thread ? "SQL_SLAVE" : ""), "] @ ", sctx->host ? sctx->host : "", " [", sctx->ip ? sctx->ip : "", "]", NullS) - |