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

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

Browse Source
This commit is contained in:
Mark Riddoch
2015-02-09 16:07:30 +00:00
parent 958cc73176 8f95765b79
commit 0afbc4e503
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macros.cmake
View File

@ -9,7 +9,7 @@ macro(set_maxscale_version)
#MaxScale version number #MaxScale version number
set(MAXSCALE_VERSION_MAJOR "1") set(MAXSCALE_VERSION_MAJOR "1")
set(MAXSCALE_VERSION_MINOR "0") 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_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}-unstable")

6
server/core/hashtable.c
View File

@ -232,7 +232,7 @@ hashtable_memory_fns(
int int
hashtable_add(HASHTABLE *table, void *key, void *value) hashtable_add(HASHTABLE *table, void *key, void *value)
{ {
int hashkey; unsigned int hashkey;
HASHENTRIES *entry; HASHENTRIES *entry;
if (key == NULL || value == NULL) if (key == NULL || value == NULL)
@ -308,7 +308,7 @@ hashtable_add(HASHTABLE *table, void *key, void *value)
int int
hashtable_delete(HASHTABLE *table, void *key) hashtable_delete(HASHTABLE *table, void *key)
{ {
int hashkey = table->hashfn(key) % table->hashsize; unsigned int hashkey = table->hashfn(key) % table->hashsize;
HASHENTRIES *entry, *ptr; HASHENTRIES *entry, *ptr;
hashtable_write_lock(table); hashtable_write_lock(table);
@ -369,7 +369,7 @@ HASHENTRIES *entry, *ptr;
void * void *
hashtable_fetch(HASHTABLE *table, void *key) hashtable_fetch(HASHTABLE *table, void *key)
{ {
int hashkey = table->hashfn(key) % table->hashsize; unsigned int hashkey = table->hashfn(key) % table->hashsize;
HASHENTRIES *entry; HASHENTRIES *entry;
hashtable_read_lock(table); hashtable_read_lock(table);

2
server/modules/protocol/mysql_client.c
View File

@ -569,7 +569,7 @@ int gw_read_client_event(
int rc = 0; int rc = 0;
int nbytes_read = 0; int nbytes_read = 0;
uint8_t cap = 0; uint8_t cap = 0;
bool stmt_input; /*< router input type */ bool stmt_input = false; /*< router input type */
CHK_DCB(dcb); CHK_DCB(dcb);
protocol = DCB_PROTOCOL(dcb, MySQLProtocol); protocol = DCB_PROTOCOL(dcb, MySQLProtocol);