summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-04-25 15:37:24 +0300
committerMonty <monty@mariadb.org>2016-04-25 15:37:24 +0300
commitf6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11 (patch)
tree56663353897e6146894fa064bd00c318f803f7cf /storage/connect
parentce38adddfa91949b30956abd0e4cab201effcdef (diff)
downloadmariadb-git-f6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11.tar.gz
Fixed failing test cases and compiler warnings
- Fixed wait condition in kill_processlist-6619 - Updated Ssl_chiper for openssl tests - Added supression for valgrinds when using libcrypto - Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug - Adding missing debug_sync_update() to debug_sync.h - Added initializers to some variables and fixed error handling in jsonudf.cpp - Fixed cluster_filter_unpack_varchar which doesn't have a stable index type. - Updated compiler_warnings.supp
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/jsonudf.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 25c77cea534..7b82ba2d627 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -533,7 +533,7 @@ PVAL JSNX::CalculateArray(PGLOBAL g, PJAR arp, int n)
/*********************************************************************************/
my_bool JSNX::CheckPath(PGLOBAL g)
{
- PJVAL val;
+ PJVAL val= NULL;
PJSON row = Row;
for (int i = 0; i < Nod && row; i++) {
@@ -1302,7 +1302,7 @@ static my_bool CalcLen(UDF_ARGS *args, my_bool obj,
{
char fn[_MAX_PATH];
unsigned long i, k, m, n;
- long fl, j = -1;
+ long fl= 0, j = -1;
reslen = args->arg_count + 2;
@@ -2087,7 +2087,7 @@ my_bool json_object_nonull_init(UDF_INIT *initid, UDF_ARGS *args,
char *json_object_nonull(UDF_INIT *initid, UDF_ARGS *args, char *result,
unsigned long *res_length, char *, char *)
{
- char *str;
+ char *str= 0;
PGLOBAL g = (PGLOBAL)initid->ptr;
if (!g->Xchk) {
@@ -2621,7 +2621,7 @@ char *json_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif Xchk
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
- PJSON top;
+ PJSON top= 0;
PJVAL jvp;
PJSON jsp[2] = {NULL, NULL};
@@ -4721,7 +4721,7 @@ char *jbin_set_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
my_bool b = true;
PJSON jsp;
PJSNX jsx;
- PJVAL jvp;
+ PJVAL jvp= 0;
PBSON bsp = NULL;
PGLOBAL g = (PGLOBAL)initid->ptr;
PGLOBAL gb = GetMemPtr(g, args, 0);
@@ -4742,6 +4742,7 @@ char *jbin_set_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!g->Xchk) {
if (CheckMemory(g, initid, args, 1, true, false, true)) {
PUSH_WARNING("CheckMemory error");
+ goto fin;
} else
jvp = MakeValue(g, args, 0);