5 files changed, 9 insertions, 5 deletions
diff --git a/storage/connect/connect.h b/storage/connect/connect.h
index bbefda52274..b877f1ffb6c 100644
--- a/storage/connect/connect.h
+++ b/storage/connect/connect.h
@@ -57,6 +57,7 @@ class DOXDEF: public DOSDEF {
 /*  This is the DOS/UNIX Access Method base class declaration.         */
 /***********************************************************************/
 class TDBDOX: public TDBDOS {
+  TDBDOX(): TDBDOS((PGLOBAL)0,(PTDBDOS) 0) {}     /* Never called */
   friend int   MakeIndex(PGLOBAL, PTDB, PIXDEF);
   friend int   CntCloseTable(PGLOBAL, PTDB, bool, bool);
   friend int   CntIndexInit(PGLOBAL, PTDB, int, bool);
diff --git a/storage/connect/csort.cpp b/storage/connect/csort.cpp
index 2f918782c80..b36653994f0 100644
--- a/storage/connect/csort.cpp
+++ b/storage/connect/csort.cpp
@@ -775,7 +775,11 @@ void CSORT::Qstc(int *base, int *max)
       /*  Small group. Do special quicker processing.                  */
       /*****************************************************************/
       if ((rc = Qcompare(base, (i = base + 1))) > 0)
-        c = *base, *base = *i, *i = c;
+      {
+        c = *base;
+        *base = *i;
+        *i = c;
+      }
 
       if (Pof)
         Pof[base - Pex] = Pof[i - Pex] = (rc) ? 1 : 2;
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 7fda7d86ece..434f7b4060c 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -1098,7 +1098,7 @@ bool GetBooleanTableOption(PGLOBAL g, PTOS options, char *opname, bool bdef)
 /****************************************************************************/
 int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
 {
-  ulonglong opval= NO_IVAL;
+  ulonglong opval= (ulonglong) NO_IVAL;
 
   if (!options)
     return idef;
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp
index 6987230121a..a60dacd80fb 100644
--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -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;
 
@@ -1370,7 +1370,6 @@ 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]) {
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index c555f2a5abb..aca4ae92927 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -681,7 +681,7 @@ bool TDBODBC::MakeCommand(PGLOBAL g)
   } else {
     sprintf(g->Message, "Cannot use this %s command",
                  (Mode == MODE_UPDATE) ? "UPDATE" : "DELETE");
-    return NULL;
+    return false;
   } // endif p
 
 	Query = new(g) STRING(g, 0, stmt);