- Commit merged files

modified:
  storage/connect/colblk.h
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/csv.result
  storage/connect/mysql-test/connect/r/dbf.result
  storage/connect/mysql-test/connect/r/fix.result
  storage/connect/mysql-test/connect/r/ini.result
  storage/connect/mysql-test/connect/r/vec.result
  storage/connect/mysql-test/connect/t/csv.test
  storage/connect/mysql-test/connect/t/dbf.test
  storage/connect/mysql-test/connect/t/fix.test
  storage/connect/mysql-test/connect/t/ini.test
  storage/connect/mysql-test/connect/t/vec.test
  storage/connect/reldef.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp

storage/connect/colblk.h

@@ -58,6 +58,7 @@ class DllExport COLBLK : public XOBJECT {
           PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}
           PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}
           bool    IsUnsigned(void) {return Unsigned;}
+          bool    IsVirtual(void) {return Cdp->IsVirtual();}
           bool    IsNullable(void) {return Nullable;}
           void    SetNullable(bool b) {Nullable = b;}
 

storage/connect/ha_connect.cc

@@ -1103,6 +1103,7 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
       break;
     case TYPE_DECIM:
       pcf->Precision= ((Field_new_decimal*)fp)->precision;
+      pcf->Length= pcf->Precision;
       pcf->Scale= fp->decimals();
       break;
     case TYPE_DATE:
@@ -4752,7 +4753,6 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
         strncpy(dsn, create_info->connect_string.str, len);
         dsn[len]= 0;
         mydef->SetName(create_info->alias);
-        mydef->SetCat(cat);
 
         if (!mydef->ParseURL(g, dsn, false)) {
           if (mydef->GetHostname())
@@ -5231,21 +5231,18 @@ int ha_connect::create(const char *name, TABLE *table_arg,
         int   port;
 
         host= GetListOption(g, "host", options->oplist, NULL);
-        db= GetListOption(g, "database", options->oplist, NULL);
+        db= GetStringOption("database", NULL);
         port= atoi(GetListOption(g, "port", options->oplist, "0"));
 
         if (create_info->connect_string.str) {
           char   *dsn;
           int     len= create_info->connect_string.length;
           PMYDEF  mydef= new(g) MYSQLDEF();
-          PDBUSER dup= PlgGetUser(g);
-          PCATLG  cat= (dup) ? dup->Catalog : NULL;
 
           dsn= (char*)PlugSubAlloc(g, NULL, len + 1);
           strncpy(dsn, create_info->connect_string.str, len);
           dsn[len]= 0;
           mydef->SetName(create_info->alias);
-          mydef->SetCat(cat);
 
           if (!mydef->ParseURL(g, dsn, false)) {
             if (mydef->GetHostname())

storage/connect/mysql-test/connect/r/csv.result

@@ -52,9 +52,9 @@ children SMALLINT(2) NOT NULL
 INSERT INTO t1 VALUES ('BILL','1973-06-30',5);
 ERROR HY000: Table 't1' is read only
 UPDATE t1 SET children=6 WHERE name='BILL';
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 DELETE FROM t1 WHERE name='BILL';
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 TRUNCATE TABLE t1;
 ERROR HY000: Table 't1' is read only
 SELECT * FROM t1;

storage/connect/mysql-test/connect/r/dbf.result

@@ -77,9 +77,9 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES (30);
 ERROR HY000: Table 't1' is read only
 UPDATE t1 SET a=30 WHERE a=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 DELETE FROM t1 WHERE a=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 TRUNCATE TABLE t1;
 ERROR HY000: Table 't1' is read only
 ALTER TABLE t1 READONLY=NO;

storage/connect/mysql-test/connect/r/fix.result

@@ -30,9 +30,9 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES (20);
 ERROR HY000: Table 't1' is read only
 UPDATE t1 SET id=20 WHERE id=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 DELETE FROM t1 WHERE id=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 TRUNCATE TABLE t1;
 ERROR HY000: Table 't1' is read only
 ALTER TABLE t1 READONLY=0;

storage/connect/mysql-test/connect/r/ini.result

@@ -194,9 +194,9 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES ('US',40);
 ERROR HY000: Table 't1' is read only
 UPDATE t1 SET c2=20 WHERE c2=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 DELETE FROM t1 WHERE c2=10;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 TRUNCATE TABLE t1;
 ERROR HY000: Table 't1' is read only
 ALTER TABLE t1 READONLY=0;

storage/connect/mysql-test/connect/r/vec.result

@@ -103,9 +103,9 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES (4,'test04');
 ERROR HY000: Table 't1' is read only
 UPDATE t1 SET b='test04' WHERE a=3;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 DELETE FROM t1 WHERE a=3;
-ERROR HY000: Table 't1' is read only
+ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT
 TRUNCATE TABLE t1;
 ERROR HY000: Table 't1' is read only
 ALTER TABLE t1 READONLY=no;

storage/connect/mysql-test/connect/t/csv.test

@@ -47,9 +47,9 @@ CREATE TABLE t1
   HEADER=1 SEP_CHAR=';' QUOTED=1 READONLY=yes;
 --error ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES ('BILL','1973-06-30',5);
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 UPDATE t1 SET children=6 WHERE name='BILL';
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 DELETE FROM t1 WHERE name='BILL';
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE t1;

storage/connect/mysql-test/connect/t/dbf.test

@@ -68,9 +68,9 @@ ALTER TABLE t1 READONLY=Yes;
 SHOW CREATE TABLE t1;
 --error ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (30);
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 UPDATE t1 SET a=30 WHERE a=10;
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 DELETE FROM t1 WHERE a=10;
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE t1;

storage/connect/mysql-test/connect/t/fix.test

@@ -30,9 +30,9 @@ ALTER TABLE t1 READONLY=1;
 SHOW CREATE TABLE t1;
 --error ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (20);
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 UPDATE t1 SET id=20 WHERE id=10;
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 DELETE FROM t1 WHERE id=10;
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE t1;

storage/connect/mysql-test/connect/t/ini.test

@@ -101,9 +101,9 @@ ALTER TABLE t1 READONLY=1;
 SHOW CREATE TABLE t1;
 --error ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES ('US',40);
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 UPDATE t1 SET c2=20 WHERE c2=10;
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 DELETE FROM t1 WHERE c2=10;
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE t1;

storage/connect/mysql-test/connect/t/vec.test

@@ -54,9 +54,9 @@ ALTER TABLE t1 READONLY=yes;
 SHOW CREATE TABLE t1;
 --error ER_OPEN_AS_READONLY
 INSERT INTO t1 VALUES (4,'test04');
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 UPDATE t1 SET b='test04' WHERE a=3;
---error ER_OPEN_AS_READONLY
+--error ER_GET_ERRMSG
 DELETE FROM t1 WHERE a=3;
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE t1;

storage/connect/reldef.h

@@ -214,6 +214,7 @@ class DllExport COLDEF : public COLCRT { /* Column description block
   int     Define(PGLOBAL g, void *memp, PCOLINFO cfp, int poff);
   void    Define(PGLOBAL g, PCOL colp);
   bool    IsSpecial(void) {return (Flags & U_SPECIAL) ? true : false;} 
+  bool    IsVirtual(void) {return (Flags & U_VIRTUAL) ? true : false;} 
 
  protected:
   void   *To_Min;              /* Point to array of block min values   */

storage/connect/tabdos.cpp

@@ -2168,10 +2168,12 @@ DOSCOL::DOSCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am)
     } // endif Opt
 
   OldVal = NULL;                  // Currently used only in MinMax
+  Dsp = 0;
   Ldz = false;
   Nod = false;
   Dcm = -1;
   p = cdp->GetFmt();
+  Buf = NULL;
 
   if (p && IsTypeNum(Buf_Type)) {
     // Formatted numeric value
@@ -2183,6 +2185,9 @@ DOSCOL::DOSCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am)
         case 'N':                 // Have no decimal point
           Nod = true;
           break;
+        case 'D':                 // Decimal separator
+          Dsp = *(++p);
+          break;
         } // endswitch p
 
     // Set number of decimal digits
@@ -2204,6 +2209,7 @@ DOSCOL::DOSCOL(DOSCOL *col1, PTDB tdbp) : COLBLK(col1, tdbp)
   Long = col1->Long;
   To_Val = col1->To_Val;
   Ldz = col1->Ldz;
+  Dsp = col1->Dsp;
   Nod = col1->Nod;
   Dcm = col1->Dcm;
   OldVal = col1->OldVal;
@@ -2277,7 +2283,7 @@ bool DOSCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
   } // endif's Value, Buf_Type
 
   // Allocate the buffer used in WriteColumn for numeric columns
-  if (IsTypeNum(Buf_Type))
+  if (!Buf && IsTypeNum(Buf_Type))
     Buf = (char*)PlugSubAlloc(g, NULL, MY_MAX(32, Long + Dcm + 1));
 
   // Because Colblk's have been made from a copy of the original TDB in
@@ -2322,14 +2328,18 @@ void DOSCOL::ReadColumn(PGLOBAL g)
   p = tdbp->To_Line + Deplac;
   field = Long;
 
-  switch (tdbp->Ftype) {
-    case RECFM_VAR:
-      /*****************************************************************/
+  /*********************************************************************/
   /*  For a variable length file, check if the field exists.           */
-      /*****************************************************************/
-      if (strlen(tdbp->To_Line) < (unsigned)Deplac)
+  /*********************************************************************/
+  if (tdbp->Ftype == RECFM_VAR && strlen(tdbp->To_Line) < (unsigned)Deplac)
     field = 0;
+  else if (Dsp)
+    for(i = 0; i < field; i++)
+      if (p[i] == Dsp)
+        p[i] = '.';
 
+  switch (tdbp->Ftype) {
+    case RECFM_VAR:
     case RECFM_FIX:            // Fixed length text file
     case RECFM_DBF:            // Fixed length DBase file
       if (Nod) switch (Buf_Type) {
@@ -2458,6 +2468,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
           len = sprintf(Buf, fmt, field - i, Value->GetTinyValue());
           break;
         case TYPE_DOUBLE:
+        case TYPE_DECIM:
           strcpy(fmt, (Ldz) ? "%0*.*lf" : "%*.*lf");
           sprintf(Buf, fmt, field + ((Nod && Dcm) ? 1 : 0),
                   Dcm, Value->GetFloatValue());
@@ -2466,7 +2477,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
           if (Nod && Dcm)
             for (i = k = 0; i < len; i++, k++)
               if (Buf[i] != ' ') {
-                if (Buf[i] == '.' || Buf[i] == ',')
+                if (Buf[i] == '.')
                   k++;
 
                 Buf[i] = Buf[k];
@@ -2474,10 +2485,13 @@ void DOSCOL::WriteColumn(PGLOBAL g)
 
           len = strlen(Buf);
           break;
+        default:
+          sprintf(g->Message, "Invalid field format for column %s", Name);
+          longjmp(g->jumper[g->jump_level], 31);
         } // endswitch BufType
 
       p2 = Buf;
-    } else                 // Standard PlugDB format
+    } else                 // Standard CONNECT format
       p2 = Value->ShowValue(Buf, field);
 
     if (trace)
@@ -2486,7 +2500,10 @@ void DOSCOL::WriteColumn(PGLOBAL g)
     if ((len = strlen(p2)) > field) {
       sprintf(g->Message, MSG(VALUE_TOO_LONG), p2, Name, field);
       longjmp(g->jumper[g->jump_level], 31);
-      } // endif
+    } else if (Dsp)
+      for (i = 0; i < len; i++)
+        if (p2[i] == '.')
+          p2[i] = Dsp; 
 
     if (trace > 1)
       htrc("buffer=%s\n", p2);

storage/connect/tabdos.h

@@ -241,7 +241,8 @@ class DllExport DOSCOL : public COLBLK {
   PVBLK Dval;         // Array of column distinct values
   PVAL  To_Val;       // To value used for Update/Insert
   PVAL  OldVal;       // The previous value of the object.
-  char *Buf;          // Buffer used in write operations
+  char *Buf;          // Buffer used in read/write operations
+  char  Dsp;          // The decimal separator
   bool  Ldz;          // True if field contains leading zeros
   bool  Nod;          // True if no decimal point
   int   Dcm;          // Last Dcm digits are decimals

storage/connect/tabfmt.cpp

@@ -597,7 +597,7 @@ int TDBCSV::EstimatedLength(PGLOBAL g)
     PCSVCOL colp;
 
     for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
-      if (!colp->IsSpecial())  // Not a pseudo column
+      if (!colp->IsSpecial() && !colp->IsVirtual())  // A true column
         Fields = MY_MAX(Fields, (int)colp->Fldnum);
 
     if (Columns)
@@ -640,7 +640,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
     if (!Fields)              // May have been set in TABFMT::OpenDB
       if (Mode != MODE_UPDATE && Mode != MODE_INSERT) {
         for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
-          if (!colp->IsSpecial())  // Not a pseudo column
+          if (!colp->IsSpecial() && !colp->IsVirtual())
             Fields = MY_MAX(Fields, (int)colp->Fldnum);
 
         if (Columns)
@@ -648,6 +648,7 @@ bool TDBCSV::OpenDB(PGLOBAL g)
 
       } else
         for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext())
+          if (!cdp->IsVirtual())
             Fields++;
 
     Offset = (int*)PlugSubAlloc(g, NULL, sizeof(int) * Fields);
@@ -671,25 +672,27 @@ bool TDBCSV::OpenDB(PGLOBAL g)
 
     if (Field)
       // Prepare writing fields
-      if (Mode != MODE_UPDATE)
-        for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next) {
+      if (Mode != MODE_UPDATE) {
+        for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
+          if (!colp->IsSpecial() && !colp->IsVirtual()) {
             i = colp->Fldnum;
             len = colp->GetLength();
             Field[i] = (PSZ)PlugSubAlloc(g, NULL, len + 1);
             Field[i][len] = '\0';
             Fldlen[i] = len;
             Fldtyp[i] = IsTypeNum(colp->GetResultType());
-          } // endfor colp
+            } // endif colp
 
-      else     // MODE_UPDATE
-        for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext()) {
+      } else     // MODE_UPDATE
+        for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext())
+          if (!cdp->IsVirtual()) {
             i = cdp->GetOffset() - 1;
             len = cdp->GetLength();
             Field[i] = (PSZ)PlugSubAlloc(g, NULL, len + 1);
             Field[i][len] = '\0';
             Fldlen[i] = len;
             Fldtyp[i] = IsTypeNum(cdp->GetType());
-          } // endfor colp
+            } // endif cdp
 
     } // endif Use
 
@@ -1100,7 +1103,7 @@ bool TDBFMT::OpenDB(PGLOBAL g)
     PDOSDEF tdp = (PDOSDEF)To_Def;
 
     for (colp = (PCSVCOL)Columns; colp; colp = (PCSVCOL)colp->Next)
-      if (!colp->IsSpecial())  // Not a pseudo column
+      if (!colp->IsSpecial() && !colp->IsVirtual())  // a true column
         Fields = MY_MAX(Fields, (int)colp->Fldnum);
 
     if (Columns)
@@ -1114,7 +1117,7 @@ bool TDBFMT::OpenDB(PGLOBAL g)
 
     // Get the column formats
     for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext())
-      if ((i = cdp->GetOffset() - 1) < Fields) {
+      if (!cdp->IsVirtual() && (i = cdp->GetOffset() - 1) < Fields) {
         if (!(pfm = cdp->GetFmt())) {
           sprintf(g->Message, MSG(NO_FLD_FORMAT), i + 1, Name);
           return true;
@@ -1336,6 +1339,11 @@ void CSVCOL::ReadColumn(PGLOBAL g)
     // Field have been copied in TDB Field array
     PSZ fp = tdbp->Field[Fldnum];
 
+    if (Dsp)
+      for (int i = 0; fp[i]; i++)
+        if (fp[i] == Dsp)
+          fp[i] = '.';
+
     Value->SetValue_psz(fp);
 
     // Set null when applicable
@@ -1383,7 +1391,10 @@ void CSVCOL::WriteColumn(PGLOBAL g)
     sprintf(g->Message, MSG(BAD_FLD_LENGTH), Name, p, flen,
                         tdbp->RowNumber(g), tdbp->GetFile(g));
     longjmp(g->jumper[g->jump_level], 34);
-    } // endif
+  } else if (Dsp)
+    for (int i = 0; p[i]; i++)
+      if (p[i] == '.')
+        p[i] = Dsp; 
 
   if (trace > 1)
     htrc("buffer=%s\n", p);

storage/connect/tabmysql.cpp

@@ -191,8 +191,7 @@ bool MYSQLDEF::ParseURL(PGLOBAL g, char *url, bool b)
 
     } else
       // Otherwise, straight server name, 
-      // use tablename of federatedx table as remote table name
-      Tabname= Name;
+      Tabname = (b) ? GetStringCatInfo(g, "Tabname", Name) : NULL;
 
     if (trace)
       htrc("server: %s  Tabname: %s", url, Tabname);