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

Fixes to Coverity cases 72678 (retry), 72693

Browse Source
This commit is contained in:
VilhoRaatikka
2014-10-31 11:38:57 +02:00
parent e739f3501b
commit 848c7aa0b8
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/include/readwritesplit.h
View File

@ -74,6 +74,7 @@ typedef enum backend_type_t {
struct router_instance; struct router_instance;
typedef enum { typedef enum {
TARGET_UNDEFINED = 0x00,
TARGET_MASTER = 0x01, TARGET_MASTER = 0x01,
TARGET_SLAVE = 0x02, TARGET_SLAVE = 0x02,
TARGET_NAMED_SERVER = 0x04, TARGET_NAMED_SERVER = 0x04,

7
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1241,7 +1241,7 @@ static route_target_t get_route_target (
target_t use_sql_variables_in, target_t use_sql_variables_in,
HINT* hint) HINT* hint)
{ {
route_target_t target; route_target_t target = TARGET_UNDEFINED;
/** /**
* These queries are not affected by hints * These queries are not affected by hints
*/ */
@ -1355,6 +1355,11 @@ static route_target_t get_route_target (
} }
hint = hint->next; hint = hint->next;
} /*< while (hint != NULL) */ } /*< while (hint != NULL) */
/** If nothing matches then choose the master */
if ((target & (TARGET_ALL|TARGET_SLAVE|TARGET_MASTER)) == target)
{
target = TARGET_MASTER;
}
} }
else else
{ {

2
utils/skygw_utils.cc
View File

@ -243,6 +243,8 @@ int skygw_rwlock_init(
strerror(err)); strerror(err));
goto return_err; goto return_err;
} }
*rwlock = rwl;
return_err: return_err:
return err; return err;
} }