hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to MXS-79: https://mariadb.atlassian.net/browse/MXS-79

Browse Source 
Added a check for empty database.
This commit is contained in:
Markus Makela
2015-04-01 10:53:30 +03:00
parent 1062d44d25
commit 04a87acced
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/routing/schemarouter/schemarouter.c
View File

@ -803,14 +803,16 @@ static void* newSession(
MySQLProtocol* protocol = session->client->protocol; MySQLProtocol* protocol = session->client->protocol;
MYSQL_session* data = session->data; MYSQL_session* data = session->data;
bool using_db = false; bool using_db = false;
bool have_db = false;
memset(db,0,MYSQL_DATABASE_MAXLEN+1); memset(db,0,MYSQL_DATABASE_MAXLEN+1);
spinlock_acquire(&protocol->protocol_lock); spinlock_acquire(&protocol->protocol_lock);
/* To enable connecting directly to a sharded database we first need /* To enable connecting directly to a sharded database we first need
* to disable it for the client DCB's protocol so that we can connect to them*/ * to disable it for the client DCB's protocol so that we can connect to them*/
if(protocol->client_capabilities & GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB) if(protocol->client_capabilities & GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB &&
(have_db = strnlen(data->db,MYSQL_DATABASE_MAXLEN) > 0))
{ {
protocol->client_capabilities &= ~GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB; protocol->client_capabilities &= ~GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB;
@ -820,7 +822,12 @@ static void* newSession(
skygw_log_write(LOGFILE_TRACE,"schemarouter: Client logging in directly to a database '%s', " skygw_log_write(LOGFILE_TRACE,"schemarouter: Client logging in directly to a database '%s', "
"postponing until databases have been mapped.",db); "postponing until databases have been mapped.",db);
} }
if(!have_db)
{
LOGIF(LT,(skygw_log_write(LT,"schemarouter: Client'%s' connecting with empty database.",data->user)));
}
spinlock_release(&protocol->protocol_lock); spinlock_release(&protocol->protocol_lock);
client_rses = (ROUTER_CLIENT_SES *)calloc(1, sizeof(ROUTER_CLIENT_SES)); client_rses = (ROUTER_CLIENT_SES *)calloc(1, sizeof(ROUTER_CLIENT_SES));