[TRAFODION-2309] Memory leak observed in Repository context

core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp

@@ -524,6 +524,29 @@ static void* SessionWatchDog(void* arg)
                 okToGo = false;
             }
         }
+        if (okToGo)
+        {
+            retcode = pSrvrStmt->ExecDirect(NULL, "CQD HIST_MISSING_STATS_WARNING_LEVEL '0'", INTERNAL_STMT, TYPE_UNKNOWN, SQL_ASYNC_ENABLE_OFF, 0);
+            if (retcode < 0)
+            {
+                errMsg.str("");
+                if(pSrvrStmt->sqlError.errorList._length > 0)
+                    p_buffer = pSrvrStmt->sqlError.errorList._buffer;
+                else if(pSrvrStmt->sqlWarning._length > 0)
+                    p_buffer = pSrvrStmt->sqlWarning._buffer;
+                if(p_buffer != NULL && p_buffer->errorText)
+                    errMsg << "Failed to turn off missing statistics warning - " << p_buffer->errorText;
+                else
+                    errMsg << "Failed to turn off missing statistics warning - " << " no additional information";
+
+                errStr = errMsg.str();
+                SendEventMsg(MSG_ODBC_NSK_ERROR, EVENTLOG_ERROR_TYPE,
+                                        0, ODBCMX_SERVER, srvrGlobal->srvrObjRef,
+                                        1, errStr.c_str());
+                okToGo = false;
+            }
+        }
+
 
 		while(!record_session_done && okToGo)
 		{
@@ -1026,6 +1049,9 @@ static void* SessionWatchDog(void* arg)
                                           }
 				}
 			}
+
+			pSrvrStmt->cleanupAll();
+			REALLOCSQLMXHDLS(pSrvrStmt);
 		}//End while
 
 	}

core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp

@@ -2334,6 +2334,7 @@ rePrepare2( SRVR_STMT_HDL *pSrvrStmt
 							  &pSrvrStmt->m_need_21036_end_msg,
 							  inSqlNewQueryType);
 		delete inSqlString;
+		delete tmpSqlString;
 	}
 	//end rs
 }  // end rePrepare2