Merge 10.0-connect -> 10.0

storage/connect/ha_connect.cc

@@ -1184,6 +1184,8 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
         pcf->Length= (len) ? len : 11;
         } // endelse
 
+      // For Value setting
+      pcf->Precision= MY_MAX(pcf->Precision, pcf->Length);
       break;
     default:
       break;
@@ -2429,7 +2431,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, AMT tty, Item *cond)
         if (!x) {
           // Append the value to the filter
           if (args[i]->field_type() == MYSQL_TYPE_VARCHAR)
-            strcat(strcat(strcat(body, "'"), res->ptr()), "'");
+            strcat(strncat(strcat(body, "'"), res->ptr(), res->length()), "'");
           else
             strncat(body, res->ptr(), res->length());
 

storage/connect/tabdos.cpp

@@ -146,7 +146,7 @@ bool DOSDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
     Eof = (GetIntCatInfo("EOF", 0) != 0);
   } else if (Recfm == RECFM_DBF) {
     Maxerr = GetIntCatInfo("Maxerr", 0);
-    Accept = (GetIntCatInfo("Accept", 0) != 0);
+    Accept = GetBoolCatInfo("Accept", false);
     ReadMode = GetIntCatInfo("Readmode", 0);
   } else // (Recfm == RECFM_VAR)
     AvgLen = GetIntCatInfo("Avglen", 0);

storage/connect/tabdos.h

@@ -77,7 +77,7 @@ class DllExport DOSDEF : public TABDEF {  /* Logical table description */
   bool    Mapped;             /* 0: disk file, 1: memory mapped file   */
   bool    Padded;             /* true for padded table file            */
   bool    Huge;               /* true for files larger than 2GB        */
-  bool    Accept;             /* true if wrong lines are accepted (DBF)*/
+  bool    Accept;             /* true if wrong lines are accepted      */
   bool    Eof;                /* true if an EOF (0xA) character exists */
   int    *To_Pos;             /* To array of block starting positions  */
   int     Optimized;          /* 0: No, 1:Yes, 2:Redo optimization     */

storage/connect/tabfmt.cpp

@@ -390,8 +390,8 @@ PQRYRES CSVColumns(PGLOBAL g, char *dp, const char *fn, char sep,
 /***********************************************************************/
 CSVDEF::CSVDEF(void)
   {
-  Fmtd = Accept = Header = false;
-  Maxerr = 0;
+  Fmtd = Header = false;
+//Maxerr = 0;
   Quoted = -1;
   Sep = ',';
   Qot = '\0';
@@ -428,9 +428,13 @@ bool CSVDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
     Qot = '"';
 
   Fmtd = (!Sep || (am && (*am == 'F' || *am == 'f')));
-  Header = (GetIntCatInfo("Header", 0) != 0);
+  Header = GetBoolCatInfo("Header", false);
   Maxerr = GetIntCatInfo("Maxerr", 0);
-  Accept = (GetIntCatInfo("Accept", 0) != 0);
+  Accept = GetBoolCatInfo("Accept", false);
+
+  if (Accept && Maxerr == 0)
+    Maxerr = INT_MAX32;       // Accept all bad lines
+
   return false;
   } // end of DefineAM