Merge branch 'ob-10.1' into 10.1

Author: Buggynours

storage/connect/CMakeLists.txt

@@ -78,7 +78,7 @@ IF(UNIX)
 
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fexceptions -fPIC ")
   get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
-  SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c)
+  SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.cpp)
   SET(IPHLPAPI_LIBRARY "")
 ELSE(NOT UNIX)
   SET(CONNECT_SOURCES ${CONNECT_SOURCES}

storage/connect/global.h

@@ -217,7 +217,8 @@ DllExport int     PlugExit(PGLOBAL);       // Plug global termination
 DllExport LPSTR   PlugRemoveType(LPSTR, LPCSTR);
 DllExport LPCSTR  PlugSetPath(LPSTR to, LPCSTR prefix, LPCSTR name, LPCSTR dir);
 DllExport BOOL    PlugIsAbsolutePath(LPCSTR path);
-DllExport void   *PlugAllocMem(PGLOBAL, uint);
+DllExport bool    AllocSarea(PGLOBAL, uint);
+DllExport void    FreeSarea(PGLOBAL);
 DllExport BOOL    PlugSubSet(PGLOBAL, void *, uint);
 DllExport void   *PlugSubAlloc(PGLOBAL, void *, size_t);
 DllExport char   *PlugDup(PGLOBAL g, const char *str);

storage/connect/ha_connect.cc

@@ -3009,7 +3009,9 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
           return NULL;
 
         if (!x) {
+					const char *p;
 					char *s = (ishav) ? havg : body;
+					uint	j, k, n;
 
           // Append the value to the filter
           switch (args[i]->field_type()) {
@@ -3065,16 +3067,38 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
                     strcat(s, "'}");
                     break;
                   default:
-                    strcat(s, "'");
-                    strncat(s, res->ptr(), res->length());
-                    strcat(s, "'");
-                  } // endswitch field type
+										j = strlen(s);
+										s[j++] = '\'';
+										p = res->ptr();
+										n = res->length();
+
+										for (k = 0; k < n; k++) {
+											if (p[k] == '\'')
+												s[j++] = '\'';
+
+											s[j++] = p[k];
+										} // endfor k
+
+										s[j++] = '\'';
+										s[j] = 0;
+								} // endswitch field type
 
               } else {
-                strcat(s, "'");
-                strncat(s, res->ptr(), res->length());
-                strcat(s, "'");
-              } // endif tty
+								j = strlen(s);
+								s[j++] = '\'';
+								p = res->ptr();
+								n = res->length();
+
+								for (k = 0; k < n; k++) {
+									if (p[k] == '\'')
+										s[j++] = '\'';
+
+									s[j++] = p[k];
+								} // endfor k
+
+								s[j++] = '\'';
+								s[j] = 0;
+							} // endif tty
 
               break;
             default:
@@ -5386,10 +5410,10 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
 #endif   // __WIN__
 //int      hdr, mxe;
 	int      port = 0, mxr = 0, rc = 0, mul = 0, lrecl = 0;
+	PCSZ     tabtyp = NULL;
 #if defined(ODBC_SUPPORT)
   POPARM   sop= NULL;
 	PCSZ     ucnc= NULL;
-	PCSZ     tabtyp = NULL;
 	bool     cnc= false;
   int      cto= -1, qto= -1;
 #endif   // ODBC_SUPPORT

storage/connect/inihandl.c renamed to storage/connect/inihandl.cpp

@@ -37,7 +37,7 @@
 // The types and variables used locally
 //typedef int bool;
 typedef unsigned int uint;
-#define SVP(S)  ((S) ? S : "<null>")
+//#define SVP(S)  ((S) ? S : "<null>")
 #define _strlwr(P)  strlwr(P)  //OB: changed this line
 #define MAX_PATHNAME_LEN  256
 #define N_CACHED_PROFILES  10
@@ -61,8 +61,8 @@ void    htrc(char const *fmt, ...)
 } /* end of htrc */
 #else   // !TEST_MODULE
 // Normal included functions
-extern  int trace;
-void    htrc(char const *fmt, ...);
+//extern  int trace;
+//void    htrc(char const *fmt, ...);
 #endif  // !TEST MODULE
 
 
@@ -112,10 +112,11 @@ static PROFILE *MRUProfile[N_CACHED_PROFILES] = {NULL};
 
 //static CRITICAL_SECTION PROFILE_CritSect = CRITICAL_SECTION_INIT("PROFILE_CritSect");
 
-static const char hex[16] = "0123456789ABCDEF";
+static const char hex[17] = "0123456789ABCDEF";
 
 BOOL  WritePrivateProfileString(LPCSTR section, LPCSTR entry,
-                                LPCSTR string, LPCSTR filename );
+                                LPCSTR string, LPCSTR filename);
+
 /***********************************************************************
  *           PROFILE_CopyEntry
  *
@@ -254,7 +255,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
   PROFILESECTION* *next_section;
   PROFILEKEY      *key, *prev_key, **next_key;
 
-  first_section = malloc(sizeof(*section));
+  first_section = (PROFILESECTION*)malloc(sizeof(*section));
 
   if (first_section == NULL)
     return NULL;
@@ -281,7 +282,7 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
         *p2 = '\0';
         p++;
 
-        if (!(section = malloc(sizeof(*section) + strlen(p))))
+        if (!(section = (PROFILESECTION*)malloc(sizeof(*section) + strlen(p))))
           break;
 
         strcpy(section->name, p);
@@ -319,13 +320,13 @@ static PROFILESECTION *PROFILE_Load( FILE *file )
       } // endif p2
 
     if (*p || !prev_key || *prev_key->name) {
-      if (!(key = malloc(sizeof(*key) + strlen(p))))
+      if (!(key = (PROFILEKEY*)malloc(sizeof(*key) + strlen(p))))
         break;
 
       strcpy(key->name, p);
 
       if (p2) {
-        key->value = malloc(strlen(p2)+1);
+        key->value = (char*)malloc(strlen(p2)+1);
         strcpy(key->value, p2);
       } else
         key->value = NULL;
@@ -452,7 +453,7 @@ static BOOL PROFILE_Open(LPCSTR filename)
   /* First time around */
   if (!CurProfile)
     for (i = 0; i < N_CACHED_PROFILES; i++) {
-      MRUProfile[i] = malloc(sizeof(PROFILE));
+      MRUProfile[i] = (PROFILE*)malloc(sizeof(PROFILE));
 
       if (MRUProfile[i] == NULL)
         break;
@@ -520,7 +521,7 @@ static BOOL PROFILE_Open(LPCSTR filename)
 //  strcpy(newdos_name, filename);
 
 //  CurProfile->dos_name = newdos_name;
-  CurProfile->filename = malloc(strlen(filename) + 1);
+  CurProfile->filename = (char*)malloc(strlen(filename) + 1);
   strcpy(CurProfile->filename, filename);
 
   /* Try to open the profile file, first in $HOME/.wine */
@@ -783,7 +784,7 @@ static PROFILEKEY *PROFILE_Find(PROFILESECTION* *section,
       if (!create)
         return NULL;
 
-      if (!(*key = malloc(sizeof(PROFILEKEY) + strlen(key_name))))
+      if (!(*key = (PROFILEKEY*)malloc(sizeof(PROFILEKEY) + strlen(key_name))))
         return NULL;
 
       strcpy((*key)->name, key_name);
@@ -798,15 +799,15 @@ static PROFILEKEY *PROFILE_Find(PROFILESECTION* *section,
   if (!create)
     return NULL;
 
-  *section = malloc(sizeof(PROFILESECTION) + strlen(section_name));
+  *section = (PROFILESECTION*)malloc(sizeof(PROFILESECTION) + strlen(section_name));
 
   if (*section == NULL)
     return NULL;
 
   strcpy((*section)->name, section_name);
   (*section)->next = NULL;
 
-  if (!((*section)->key = malloc(sizeof(PROFILEKEY) + strlen(key_name)))) {
+  if (!((*section)->key = (tagPROFILEKEY*)malloc(sizeof(PROFILEKEY) + strlen(key_name)))) {
     free(*section);
     return NULL;
     }  // endif malloc
@@ -1052,7 +1053,7 @@ static BOOL PROFILE_SetString(LPCSTR section_name, LPCSTR key_name,
     }  else if (trace > 1)
       htrc("  creating key\n" );
 
-    key->value = malloc(strlen(value) + 1);
+    key->value = (char*)malloc(strlen(value) + 1);
     strcpy(key->value, value);
     CurProfile->changed = TRUE;
   } // endelse
@@ -1125,7 +1126,7 @@ static int PROFILE_GetPrivateProfileString(LPCSTR section, LPCSTR entry,
     if (*p == ' ') {        /* ouch, contained trailing ' ' */
       int len = p - (LPSTR)def_val;
 
-      pDefVal = malloc(len + 1);
+      pDefVal = (LPSTR)malloc(len + 1);
       strncpy(pDefVal, def_val, len);
       pDefVal[len] = '\0';
       } // endif *p
@@ -1277,7 +1278,7 @@ BOOL WritePrivateProfileSection(LPCSTR section,
       ret = TRUE;
 
       while (*string) {
-        LPSTR buf = malloc(strlen(string) + 1);
+        LPSTR buf = (LPSTR)malloc(strlen(string) + 1);
         strcpy(buf, string);
 
         if ((p = strchr(buf, '='))) {

storage/connect/jsonudf.cpp

@@ -1505,23 +1505,16 @@ static my_bool CheckMemory(PGLOBAL g, UDF_INIT *initid, UDF_ARGS *args, uint n,
 			ml += g->More;
 
 			if (ml > g->Sarea_Size) {
-#if !defined(DEVELOPMENT)
-				if (trace)
-#endif
-					htrc("Freeing Sarea at %p size=%d\n", g->Sarea, g->Sarea_Size);
-
-				free(g->Sarea);
+				FreeSarea(g);
 
-				if (!(g->Sarea = PlugAllocMem(g, ml))) {
+				if (AllocSarea(g, ml)) {
 					char errmsg[MAX_STR];
 
 					sprintf(errmsg, MSG(WORK_AREA), g->Message);
 					strcpy(g->Message, errmsg);
-					g->Sarea_Size = 0;
 					return true;
-					} // endif Alloc
+					} // endif SareaAlloc
 
-				g->Sarea_Size = ml;
 				g->Createas = 0;
 				g->Xchk = NULL;
 				initid->max_length = rl;

storage/connect/plgdbutl.cpp

@@ -334,7 +334,7 @@ PDBUSER PlgMakeUser(PGLOBAL g)
   {
   PDBUSER dbuserp;
 
-  if (!(dbuserp = (PDBUSER)PlugAllocMem(g, (uint)sizeof(DBUSERBLK)))) {
+  if (!(dbuserp = (PDBUSER)malloc(sizeof(DBUSERBLK)))) {
     sprintf(g->Message, MSG(MALLOC_ERROR), "PlgMakeUser");
     return NULL;
     } // endif dbuserp

storage/connect/plugutil.cpp

@@ -138,7 +138,7 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize)
 
 	if (trace > 1)
 		htrc("PlugInit: Language='%s'\n",
-		((!Language) ? "Null" : (char*)Language));
+			((!Language) ? "Null" : (char*)Language));
 
 	try {
 		g = new GLOBAL;
@@ -160,13 +160,11 @@ PGLOBAL PlugInit(LPCSTR Language, uint worksize)
 	/*******************************************************************/
 	/*  Allocate the main work segment.                                */
 	/*******************************************************************/
-	if (worksize && !(g->Sarea = PlugAllocMem(g, worksize))) {
+	if (worksize && AllocSarea(g, worksize)) {
 		char errmsg[MAX_STR];
 		sprintf(errmsg, MSG(WORK_AREA), g->Message);
 		strcpy(g->Message, errmsg);
-		g->Sarea_Size = 0;
-	} else
-		g->Sarea_Size = worksize;
+	} // endif Sarea
 
 	g->jump_level = -1;   /* New setting to allow recursive call of Plug */
 	return(g);
@@ -183,15 +181,7 @@ int PlugExit(PGLOBAL g)
 		if (dup)
 			free(dup);
 
-		if (g->Sarea) {
-#if !defined(DEVELOPMENT)
-			if (trace)
-#endif
-				htrc("Freeing Sarea at %p size=%d\n", g->Sarea, g->Sarea_Size);
-
-			free(g->Sarea);
-		}	// endif Sarea
-
+		FreeSarea(g);
 		delete g;
 	}	// endif g
 
@@ -459,30 +449,65 @@ short GetLineLength(PGLOBAL g)
 /***********************************************************************/
 /*  Program for memory allocation of work and language areas.          */
 /***********************************************************************/
-void *PlugAllocMem(PGLOBAL g, uint size)
+bool AllocSarea(PGLOBAL g, uint size)
 {
-  void *areap;                     /* Pointer to allocated area        */
-
   /*********************************************************************/
   /*  This is the allocation routine for the WIN32/UNIX/AIX version.   */
   /*********************************************************************/
-  if (!(areap = malloc(size)))
-    sprintf(g->Message, MSG(MALLOC_ERROR), "malloc");
+#if defined(__WIN__)
+	if (size >= 1048576)			 // 1M
+		g->Sarea = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+	else
+#endif
+		g->Sarea = malloc(size);
+
+	if (!g->Sarea) {
+		sprintf(g->Message, MSG(MALLOC_ERROR), "malloc");
+		g->Sarea_Size = 0;
+	}	else
+		g->Sarea_Size = size;
 
 #if defined(DEVELOPMENT)
 	if (true) {
 #else
 	if (trace) {
 #endif
-    if (areap)
-      htrc("Memory of %u allocated at %p\n", size, areap);
+    if (g->Sarea)
+      htrc("Work area of %u allocated at %p\n", size, g->Sarea);
     else
-      htrc("PlugAllocMem: %s\n", g->Message);
+      htrc("SareaAlloc: %s\n", g->Message);
 
   } // endif trace
 
-  return (areap);
-} // end of PlugAllocMem
+  return (!g->Sarea);
+} // end of AllocSarea
+
+/***********************************************************************/
+/*  Program for memory freeing the work area.                          */
+/***********************************************************************/
+void FreeSarea(PGLOBAL g)
+{
+	if (g->Sarea) {
+#if defined(__WIN__)
+		if (g->Sarea_Size >= 1048576)			 // 1M
+			VirtualFree(g->Sarea, 0, MEM_RELEASE);
+		else
+#endif
+			free(g->Sarea);
+
+#if defined(DEVELOPMENT)
+		if (true)
+#else
+		if (trace)
+#endif
+			htrc("Freeing Sarea at %p size = %d\n", g->Sarea, g->Sarea_Size);
+
+		g->Sarea = NULL;
+		g->Sarea_Size = 0;
+	} // endif Sarea
+
+	return;
+} // end of FreeSarea
 
 /***********************************************************************/
 /*  Program for SubSet initialization of memory pools.                 */