diff --git a/server/core/load_utils.c b/server/core/load_utils.c index 28c95a3ae..ba5507018 100644 --- a/server/core/load_utils.c +++ b/server/core/load_utils.c @@ -106,6 +106,7 @@ MODULES *mod; return NULL; } } + if ((dlhandle = dlopen(fname, RTLD_NOW|RTLD_LOCAL)) == NULL) { LOGIF(LE, (skygw_log_write_flush( @@ -156,9 +157,10 @@ MODULES *mod; LOGIF(LM, (skygw_log_write_flush( LOGFILE_MESSAGE, - "Loaded module %s: %s.", + "Loaded module %s: %s from %s", module, - version))); + version, + fname))); register_module(module, type, dlhandle, version, modobj); } else diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c index 574c5d426..ba1013e95 100644 --- a/server/modules/protocol/mysql_client.c +++ b/server/modules/protocol/mysql_client.c @@ -36,7 +36,6 @@ * 07/05/2014 Massimiliano Pinto Added: specific version string in server handshake * */ - #include #include #include @@ -511,7 +510,6 @@ int gw_read_client_event(DCB* dcb) { int b = -1; int rc = 0; int nbytes_read = 0; - CHK_DCB(dcb); protocol = DCB_PROTOCOL(dcb, MySQLProtocol); CHK_PROTOCOL(protocol); @@ -562,7 +560,6 @@ int gw_read_client_event(DCB* dcb) { goto return_rc; } - rc = gw_read_gwbuff(dcb, &read_buffer, b); if (rc != 0) {