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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-02-07 10:50:27 +02:00
parent 934be45b68 b560a67e54
commit 42b5c39f43
12 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/cache/test/testkeygeneration.cc vendored
View File

@ -122,7 +122,7 @@ int test(StorageFactory& factory, istream& in)
int main(int argc, char* argv[])
{
int rv = EXIT_FAILURE;
StorageFactory* pFactory;
StorageFactory* pFactory = nullptr;
if ((argc == 2) || (argc == 3))
{
char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/");

4
server/modules/filter/hintfilter/hintparser.cc
View File

@ -130,7 +130,9 @@ HINT* hint_parser(HINT_SESSION* session, GWBUF* request)
int len, residual, state;
int found, escape, quoted, squoted;
HINT* rval = NULL;
char* pname, * lvalue, * hintname = NULL;
char* pname = nullptr;
char* lvalue = nullptr;
char* hintname = nullptr;
GWBUF* buf;
HINT_TOKEN* tok;
HINT_MODE mode = HM_EXECUTE;

2
server/modules/filter/tpmfilter/tpmfilter.cc
View File

@ -739,7 +739,7 @@ static void destroyInstance(MXS_FILTER* instance)
static void checkNamedPipe(TPM_INSTANCE* inst)
{
int ret;
int ret = 0;
char buffer[2];
char buf[4096];
char* named_pipe = inst->named_pipe;

2
server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
View File

@ -487,7 +487,7 @@ private:
{
result_t rv = IS_SET_SQL_MODE;
char c;
char c = *pSql_mode;
do
{

3
server/modules/routing/avrorouter/avro_schema.cc
View File

@ -57,7 +57,8 @@ bool json_extract_field_names(const char* filename, std::vector<Column>& columns
bool rval = false;
json_error_t err;
err.text[0] = '\0';
json_t* obj, * arr;
json_t* obj;
json_t* arr = nullptr;
if ((obj = json_load_file(filename, 0, &err)) && (arr = json_object_get(obj, "fields")))
{

6
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -3063,17 +3063,17 @@ void blr_handle_fake_gtid_list(ROUTER_INSTANCE* router,
static bool blr_handle_missing_files(ROUTER_INSTANCE* router,
char* new_file)
{
char* fptr;
char* fptr = strrchr(new_file, '.');
uint32_t new_fseqno;
uint32_t curr_fseqno;
char buf[BLRM_BINLOG_NAME_STR_LEN];
char bigbuf[PATH_MAX + 1];
if (*new_file
&& (fptr = strrchr(new_file, '.')) == NULL)
if (fptr == NULL)
{
return false;
}
if (router->fileroot)
{
MXS_FREE(router->fileroot);