From 7eff7f8e9e0abf45ec18e29663322b04b2672cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 22 May 2019 19:43:39 +0300 Subject: [PATCH] Remove unused function in mysql_common.cc --- .../MySQL/mariadbbackend/mysql_backend.cc | 1 - server/modules/protocol/MySQL/mysql_common.cc | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index b2f50777b..ca2b2a588 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -44,7 +44,6 @@ static void backend_set_delayqueue(DCB* dcb, GWBUF* queue); static int gw_change_user(DCB* backend_dcb, SERVER* server, MXS_SESSION* in_session, GWBUF* queue); static char* gw_backend_default_auth(); static GWBUF* process_response_data(DCB* dcb, GWBUF** readbuf, int nbytes_to_process); -extern char* create_auth_failed_msg(GWBUF* readbuf, char* hostaddr, uint8_t* sha1); static bool sescmd_response_complete(DCB* dcb); static void gw_reply_on_error(DCB* dcb, mxs_auth_state_t state); static int gw_read_and_write(DCB* dcb); diff --git a/server/modules/protocol/MySQL/mysql_common.cc b/server/modules/protocol/MySQL/mysql_common.cc index 30a6ffe20..1df80559e 100644 --- a/server/modules/protocol/MySQL/mysql_common.cc +++ b/server/modules/protocol/MySQL/mysql_common.cc @@ -453,25 +453,6 @@ int mysql_send_auth_error(DCB* dcb, return sizeof(mysql_packet_header) + mysql_payload_size; } -char* create_auth_failed_msg(GWBUF* readbuf, - char* hostaddr, - uint8_t* sha1) -{ - char* errstr; - char* uname = (char*)GWBUF_DATA(readbuf) + 5; - const char* ferrstr = "Access denied for user '%s'@'%s' (using password: %s)"; - - /** -4 comes from 2X'%s' minus terminating char */ - errstr = (char*)MXS_MALLOC(strlen(uname) + strlen(ferrstr) + strlen(hostaddr) + strlen("YES") - 6 + 1); - - if (errstr != NULL) - { - sprintf(errstr, ferrstr, uname, hostaddr, (*sha1 == '\0' ? "NO" : "YES")); - } - - return errstr; -} - /** * Create a message error string to send via MySQL ERR packet. *