From c168176c344d65b13c1bde18e0805681911c1c60 Mon Sep 17 00:00:00 2001 From: WjR Date: Tue, 26 Sep 2017 09:11:53 +0800 Subject: [PATCH] fix gcc 7 build --- src/audit_handler.cc | 2 +- src/audit_plugin.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audit_handler.cc b/src/audit_handler.cc index 2ceee3d..2b9a22f 100644 --- a/src/audit_handler.cc +++ b/src/audit_handler.cc @@ -696,7 +696,7 @@ ssize_t Audit_json_formatter::start_msg_format(IWriter *writer) yajl_add_string_val(gen, "msg-type", "header"); uint64 ts = my_getsystime() / (10000); yajl_add_uint64(gen, "date", ts); - yajl_add_string_val(gen, "audit-version", MYSQL_AUDIT_PLUGIN_VERSION"-"MYSQL_AUDIT_PLUGIN_REVISION); + yajl_add_string_val(gen, "audit-version", MYSQL_AUDIT_PLUGIN_VERSION "-" MYSQL_AUDIT_PLUGIN_REVISION); yajl_add_string_val(gen, "audit-protocol-version", AUDIT_PROTOCOL_VERSION); yajl_add_string_val(gen, "hostname", glob_hostname); yajl_add_string_val(gen, "mysql-version", server_version); diff --git a/src/audit_plugin.cc b/src/audit_plugin.cc index 60487a1..c1dd163 100644 --- a/src/audit_plugin.cc +++ b/src/audit_plugin.cc @@ -104,12 +104,12 @@ static char password_masking_regex_buff[4096] = {0}; static const char default_pw_masking_regex[] = // identified by [password] '***' - "identified"_COMMENT_SPACE_"by"_COMMENT_SPACE_"(?:password)?"_COMMENT_SPACE_ _QUOTED_PSW_ + "identified" _COMMENT_SPACE_ "by" _COMMENT_SPACE_ "(?:password)?" _COMMENT_SPACE_ _QUOTED_PSW_ // password function - "|password"_COMMENT_SPACE_"\\("_COMMENT_SPACE_ _QUOTED_PSW_ _COMMENT_SPACE_"\\)" + "|password" _COMMENT_SPACE_ "\\(" _COMMENT_SPACE_ _QUOTED_PSW_ _COMMENT_SPACE_ "\\)" // Used at: CHANGE MASTER TO MASTER_PASSWORD='new3cret', SET PASSWORD [FOR user] = 'hash', password 'user_pass'; - "|password"_COMMENT_SPACE_"(?:for"_COMMENT_SPACE_"\\S+?)?"_COMMENT_SPACE_"="_COMMENT_SPACE_ _QUOTED_PSW_ - "|password"_COMMENT_SPACE_ _QUOTED_PSW_ + "|password" _COMMENT_SPACE_ "(?:for" _COMMENT_SPACE_ "\\S+?)?" _COMMENT_SPACE_ "=" _COMMENT_SPACE_ _QUOTED_PSW_ + "|password" _COMMENT_SPACE_ _QUOTED_PSW_ // federated engine create table with connection. See: http://dev.mysql.com/doc/refman/5.5/en/federated-create-connection.html // commented out as federated engine is disabled by default // "|ENGINE"_COMMENT_SPACE_"="_COMMENT_SPACE_"FEDERATED"_COMMENT_SPACE_".*CONNECTION"_COMMENT_SPACE_"="_COMMENT_SPACE_"[\'|\"]\\S+?://\\S+?:(?.*)@\\S+[\'|\"]" @@ -388,7 +388,7 @@ PeerInfo *retrieve_peerinfo(THD *thd) { PeerInfo *peer = (PeerInfo *) THDVAR(thd, peer_info); - if (THDVAR(thd, peer_is_uds) && peer != NULL); + if (THDVAR(thd, peer_is_uds) && peer != NULL)//; { return peer; }