Commit the 2 last commits merged from 10.1

Author: Buggynours

storage/connect/ha_connect.cc

@@ -172,7 +172,7 @@
 #define JSONMAX 10 // JSON Default max grp size
 
 extern "C" {
- char version[]= "Version 1.05.0003 February 27, 2017";
+ char version[]= "Version 1.05.0003 March 7, 2017";
 #if defined(__WIN__)
  char compver[]= "Version 1.05.0003 " __DATE__ " " __TIME__;
  char slash= '\\';
@@ -509,7 +509,7 @@ ha_create_table_option connect_table_option_list[]=
  HA_TOPTION_NUMBER("LRECL", lrecl, 0, 0, INT_MAX32, 1),
  HA_TOPTION_NUMBER("BLOCK_SIZE", elements, 0, 0, INT_MAX32, 1),
 //HA_TOPTION_NUMBER("ESTIMATE", estimate, 0, 0, INT_MAX32, 1),
- HA_TOPTION_NUMBER("MULTIPLE", multiple, 0, 0, 2, 1),
+ HA_TOPTION_NUMBER("MULTIPLE", multiple, 0, 0, 3, 1),
  HA_TOPTION_NUMBER("HEADER", header, 0, 0, 3, 1),
  HA_TOPTION_NUMBER("QUOTED", quoted, (ulonglong) -1, 0, 3, 1),
  HA_TOPTION_NUMBER("ENDING", ending, (ulonglong) -1, 0, INT_MAX32, 1),

storage/connect/myconn.cpp

@@ -135,10 +135,12 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
  FLD_KEY, FLD_SCALE, FLD_RADIX, FLD_NULL,
  FLD_REM, FLD_NO, FLD_DEFAULT, FLD_EXTRA,
  FLD_CHARSET};
- unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0};
- char *fld, *colname, *chset, *fmt, v, buf[128], uns[16], zero[16];
+ //unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0};
+unsigned int length[] = {0, 4, 0, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0};
+char *fld, *colname, *chset, *fmt, v, buf[128], uns[16], zero[16];
  int i, n, nf, ncol = sizeof(buftyp) / sizeof(int);
  int len, type, prec, rc, k = 0;
+bool b;
  PQRYRES qrp;
  PCOLRES crp;
  MYSQLC myc;
@@ -157,7 +159,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
  /* Do an evaluation of the result size. */
  /********************************************************************/
  STRING cmd(g, 64, "SHOW FULL COLUMNS FROM ");
- bool b = cmd.Append((PSZ)table);
+ b = cmd.Append((PSZ)table);
 
  b |= cmd.Append(" FROM ");
  b |= cmd.Append((PSZ)(db ? db : PlgGetUser(g)->DBName));
@@ -232,11 +234,31 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
  fld = myc.GetCharField(1);
  prec = 0;
  len = 0;
- v = (chset && !strcmp(chset, "binary")) ? 'B' : 0;
+// v = (chset && !strcmp(chset, "binary")) ? 'B' : 0;
+v = 0;
  *uns = 0;
  *zero = 0;
-
- switch ((nf = sscanf(fld, "%[^(](%d,%d", buf, &len, &prec))) {
+b = false;
+
+if (!strnicmp(fld, "enum", 4)) {
+char *p2, *p1 = fld + 6; // to skip enum('
+
+while (true) {
+p2 = strchr(p1, '\'');
+len = MY_MAX(len, p2 - p1);
+if (*++p2 != ',') break;
+p1 = p2 + 2;
+} // endwhile
+
+v = (len > 255) ? 'V' : 0;
+strcpy(buf, "enum");
+b = true;
+} else if (!strnicmp(fld, "set", 3)) {
+len = (int)strlen(fld) - 2;
+v = 'V';
+strcpy(buf, "set");
+b = true;
+} else switch ((nf = sscanf(fld, "%[^(](%d,%d", buf, &len, &prec))) {
  case 3:
  nf = sscanf(fld, "%[^(](%d,%d) %s %s", buf, &len, &prec, uns, zero);
  break;
@@ -271,7 +293,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
  colname, len);
  PushWarning(g, thd);
  v = 'V';
- } else
+} else
  len = MY_MIN(len, 4096);
 
  } // endif type
@@ -286,6 +308,9 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
  default: crp->Nulls[i] = v; break;
  } // endswitch nf
 
+if (b) // enum or set
+	nf = sscanf(fld, "%s ", buf); // get values
+
  crp = crp->Next; // Type_Name
  crp->Kdata->SetValue(buf, i);
 

storage/connect/myutil.cpp

@@ -42,7 +42,8 @@ int MYSQLtoPLG(char *typname, char *var)
  type = TYPE_INT;
  else if (!stricmp(typname, "smallint"))
  type = TYPE_SHORT;
- else if (!stricmp(typname, "char") || !stricmp(typname, "varchar"))
+ else if (!stricmp(typname, "char") || !stricmp(typname, "varchar") ||
+ !stricmp(typname, "enum") || !stricmp(typname, "set"))
  type = TYPE_STRING;
  else if (!stricmp(typname, "double") || !stricmp(typname, "float") ||
  !stricmp(typname, "real"))
@@ -87,10 +88,12 @@ int MYSQLtoPLG(char *typname, char *var)
  else if (!stricmp(typname, "year"))
  *var = 'Y';
 
- } else if (type == TYPE_STRING && !stricmp(typname, "varchar"))
- // This is to make the difference between CHAR and VARCHAR 
- *var = 'V';
- else if (type == TYPE_ERROR && xconv == TPC_SKIP)
+} else if (type == TYPE_STRING) {
+if (!stricmp(typname, "varchar"))
+ // This is to make the difference between CHAR and VARCHAR
+*var = 'V';
+
+} else if (type == TYPE_ERROR && xconv == TPC_SKIP)
  *var = 'K';
  else
  *var = 0;