summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorkevg <claprix@yandex.ru>2016-11-24 17:36:02 +0300
committerkevg <claprix@yandex.ru>2016-11-24 17:36:02 +0300
commit780db8e25239e5423cfab50c04c60b79ebc0224b (patch)
tree2c73735c76607093d466a143627efdd8b4fbc2ca /sql/log.cc
parentf4d6f26a4fae3f0cfcc6e77667c7697c4e024189 (diff)
downloadmariadb-git-780db8e25239e5423cfab50c04c60b79ebc0224b.tar.gz
fix build and some warnings
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 4d903154d98..9f43e363e50 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1307,7 +1307,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) -