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

Merge branch 'MAX-324' of https://github.com/mariadb-corporation/MaxScale into MAX-324

Browse Source
This commit is contained in:
VilhoRaatikka
2014-12-02 10:37:53 +02:00
parent ef4f9aac4f 1135b2c23f
commit 83477042a1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/dbshard/dbshard.c
View File

@ -324,8 +324,8 @@ static void* hfree(void* fval)
*/
bool update_dbnames_hash(BACKEND** backends, HASHTABLE* hashtable)
{
const unsigned int connect_timeout = 5;
const unsigned int read_timeout = 2;
const unsigned int connect_timeout = 15;
const unsigned int read_timeout = 10;
bool rval = true;
SERVER* server;
MYSQL* handle;
@ -402,6 +402,9 @@ bool update_dbnames_hash(BACKEND** backends, HASHTABLE* hashtable)
char *dbnm = NULL,*servnm = NULL;
lengths = mysql_fetch_lengths(result);
if(strncmp(row[0],"information_schema",lengths[0]) == 0){
continue;
}
dbnm = (char*)calloc(lengths[0] + 1,sizeof(char));
memcpy(dbnm,row[0],lengths[0]);
servnm = strdup(server->unique_name);
@ -706,6 +709,7 @@ createInstance(SERVICE *service, char **options)
}
router->servers[nservers]->backend_server = server;
router->servers[nservers]->backend_conn_count = 0;
router->servers[nservers]->weight = 1;
router->servers[nservers]->be_valid = false;
#if defined(SS_DEBUG)
router->servers[nservers]->be_chk_top = CHK_NUM_BACKEND;