From 46c0c70764fc89360d22467f71ee3f63789fa1c3 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 6 Feb 2015 22:59:47 +0200 Subject: [PATCH 1/4] Fixed negative values from hashing functions causing segmentation faults. --- server/core/hashtable.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/core/hashtable.c b/server/core/hashtable.c index 1b2897d75..86d1d821e 100644 --- a/server/core/hashtable.c +++ b/server/core/hashtable.c @@ -232,7 +232,7 @@ hashtable_memory_fns( int hashtable_add(HASHTABLE *table, void *key, void *value) { - int hashkey; + unsigned int hashkey; HASHENTRIES *entry; if (key == NULL || value == NULL) @@ -308,7 +308,7 @@ hashtable_add(HASHTABLE *table, void *key, void *value) int hashtable_delete(HASHTABLE *table, void *key) { -int hashkey = table->hashfn(key) % table->hashsize; +unsigned int hashkey = table->hashfn(key) % table->hashsize; HASHENTRIES *entry, *ptr; hashtable_write_lock(table); @@ -369,7 +369,7 @@ HASHENTRIES *entry, *ptr; void * hashtable_fetch(HASHTABLE *table, void *key) { -int hashkey = table->hashfn(key) % table->hashsize; +unsigned int hashkey = table->hashfn(key) % table->hashsize; HASHENTRIES *entry; hashtable_read_lock(table); From 5ba2bf33e9c49570571615233e63fcd7de8b4c39 Mon Sep 17 00:00:00 2001 From: MassimilianoPinto Date: Sat, 7 Feb 2015 11:02:39 +0100 Subject: [PATCH 2/4] Fix Coverity defect 87079 Fix Coverity defect 87079 --- server/modules/protocol/mysql_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c index 14ca611e8..f78bb4537 100644 --- a/server/modules/protocol/mysql_client.c +++ b/server/modules/protocol/mysql_client.c @@ -569,7 +569,7 @@ int gw_read_client_event( int rc = 0; int nbytes_read = 0; uint8_t cap = 0; - bool stmt_input; /*< router input type */ + bool stmt_input = false; /*< router input type */ CHK_DCB(dcb); protocol = DCB_PROTOCOL(dcb, MySQLProtocol); From b6bcb55c7df051a951e6419bac19d0fdf1ec49c6 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Sun, 8 Feb 2015 12:26:48 +0200 Subject: [PATCH 3/4] set 1.0.5-GA stable version --- macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake b/macros.cmake index 0bac0be23..de9e74a66 100644 --- a/macros.cmake +++ b/macros.cmake @@ -11,7 +11,7 @@ macro(set_maxscale_version) set(MAXSCALE_VERSION_MINOR "0") set(MAXSCALE_VERSION_PATCH "5") set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}") - set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-unstable") + set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-stable") endmacro() From 8f95765b7923b294396cdca0297158a0e62a8aac Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Sun, 8 Feb 2015 20:05:54 +0200 Subject: [PATCH 4/4] set 1.0.6 unstable version --- macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.cmake b/macros.cmake index de9e74a66..3dd3dc03b 100644 --- a/macros.cmake +++ b/macros.cmake @@ -9,9 +9,9 @@ macro(set_maxscale_version) #MaxScale version number set(MAXSCALE_VERSION_MAJOR "1") set(MAXSCALE_VERSION_MINOR "0") - set(MAXSCALE_VERSION_PATCH "5") + set(MAXSCALE_VERSION_PATCH "6") set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}") - set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-stable") + set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-unstable") endmacro()