Merge branch 'release-1.0GA' into MAX-324

2015-01-08 14:11:19 +02:00
parent aa60e02697 2a02b2deba
commit 632190f9aa
4 changed files with 24 additions and 5 deletions
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@ -3842,7 +3842,7 @@ static bool execute_sescmd_in_backend(
 			tmpbuf = scur->scmd_cur_cmd->my_sescmd_buf;
 			qlen = MYSQL_GET_PACKET_LEN((unsigned char*)tmpbuf->start);
 			memset(data->db,0,MYSQL_DATABASE_MAXLEN+1);
-			if(qlen > 0 && qlen < UINT_MAX)
+			if(qlen > 0 && qlen < MYSQL_DATABASE_MAXLEN+1)
 				strncpy(data->db,tmpbuf->start+5,qlen - 1);			
 		}
 		/** Fallthrough */