Fixed compiler warnings and test failures found by buildbot

6 files changed, 14 insertions, 8 deletions

diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 25c77cea534..6987230121a 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++) {
@@ -1370,7 +1370,7 @@ static my_bool CalcLen(UDF_ARGS *args, my_bool obj,
       memlen += (k + sizeof(JOBJECT) + sizeof(JPAIR));
     } else
       memlen += sizeof(JARRAY);
-
+                fl= 0;
 		switch (args->arg_type[i]) {
 			case STRING_RESULT:
 				if (n == 2 && args->args[i]) {
@@ -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 = NULL;
   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);
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index 55ccbdbada1..b5ba3bc67da 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -1752,7 +1752,7 @@ bool ODBConn::BindParam(ODBCCOL *colp)
   void        *buf;
   int          buftype = colp->GetResultType();
   SQLUSMALLINT n = colp->GetRank();
-  SQLSMALLINT  ct, sqlt, dec, nul;
+  SQLSMALLINT  ct, sqlt, dec, nul __attribute__((unused));
   SQLULEN      colsize;
   SQLLEN       len;
   SQLLEN      *strlen = colp->GetStrLen();
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc
index 0dff05567d7..80724372f27 100644
--- a/storage/innobase/dict/dict0boot.cc
+++ b/storage/innobase/dict/dict0boot.cc
@@ -468,7 +468,7 @@ dict_boot(void)
 			} else {
 				ib_logf(IB_LOG_LEVEL_WARN,
 					"Change buffer not empty when --innodb-read-only "
-					"is set! but srv_force_recovery = %d, ignoring.",
+					"is set! but srv_force_recovery = %lu, ignoring.",
 					srv_force_recovery);
 			}
 		}
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index bbd7ee1b650..96df08acdec 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -2736,7 +2736,7 @@ fsp_reserve_free_extents(
 	ulint		zip_size;
 	ulint		n_free;
 	ulint		n_free_up;
-	ulint		reserve;
+	ulint		reserve= 0;
 	ibool		success;
 	ulint		n_pages_added;
 	size_t		total_reserved = 0;
diff --git a/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result
index b287c70469e..894de50f863 100644
--- a/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-rand-insert.result
@@ -3,6 +3,7 @@ drop table if exists t;
 create table t (id int not null primary key, v longblob not null);
 select @@max_allowed_packet into @my_max_allowed_packet;
 set global max_allowed_packet=100000000;
+connect conn1,localhost,root,,;
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
@@ -1003,6 +1004,8 @@ insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
 insert ignore into t (id,v) values (floor(rand()*1000),repeat('a',(32*1024*1024-4)*rand()));
+connection default;
+disconnect conn1;
 set global max_allowed_packet=@my_max_allowed_packet;
 check table t;
 Table	Op	Msg_type	Msg_text
diff --git a/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result
index a242cac98c2..ddd5b908231 100644
--- a/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result
+++ b/storage/tokudb/mysql-test/tokudb/r/rows-32m-seq-insert.result
@@ -3,6 +3,7 @@ drop table if exists t;
 create table t (id int not null auto_increment primary key, v longblob not null);
 select @@max_allowed_packet into @my_max_allowed_packet;
 set global max_allowed_packet=100000000;
+connect conn1,localhost,root,,;
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
@@ -1003,6 +1004,8 @@ insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
 insert into t (v) values (repeat('a',(32*1024*1024-4)*rand()));
+connection default;
+disconnect conn1;
 set global max_allowed_packet=@my_max_allowed_packet;
 check table t;
 Table	Op	Msg_type	Msg_text