Merge 10.0-connect -> 10.0.

storage/connect/colblk.cpp

@@ -41,6 +41,7 @@ COLBLK::COLBLK(PCOLDEF cdp, PTDB tdbp, int i)
     Buf_Type = cdp->Buf_Type;
     ColUse |= cdp->Flags;       // Used by CONNECT
     Nullable = !!(cdp->Flags & U_NULLS);
+    Unsigned = !!(cdp->Flags & U_UNSIGNED);
   } else {
     Name = NULL;
     memset(&Format, 0, sizeof(FORMAT));
@@ -48,6 +49,7 @@ COLBLK::COLBLK(PCOLDEF cdp, PTDB tdbp, int i)
     Long = 0;
     Buf_Type = TYPE_ERROR;
     Nullable = false;
+    Unsigned = false;
   } // endif cdp
 
   To_Tdb = tdbp;
@@ -171,9 +173,12 @@ bool COLBLK::InitValue(PGLOBAL g)
   if (Value)
     return false;                       // Already done
 
+  // Unsigned can be set only for valid value types
+  int prec = (Unsigned) ? 1 : GetPrecision();
+
   // Allocate a Value object
   if (!(Value = AllocateValue(g, Buf_Type, Format.Length,
-                                 GetPrecision(), GetDomain())))
+                                 prec, GetDomain())))
     return true;
 
   AddStatus(BUF_READY);

storage/connect/colblk.h

@@ -83,6 +83,7 @@ class DllExport COLBLK : public XOBJECT {
   PTDB    To_Tdb;              // Points to Table Descriptor Block
   PXCOL   To_Kcol;             // Points to Xindex matching column
   bool    Nullable;            // True if nullable
+  bool    Unsigned;            // True if unsigned
   int     Index;               // Column number in table
   int     Opt;                 // Cluster/sort information
   int     Buf_Type;            // Data type

storage/connect/connect.cc

@@ -591,7 +591,7 @@ int CntIndexInit(PGLOBAL g, PTDB ptdb, int id)
   if (!ptdb)
     return -1;
   else if (!((PTDBASE)ptdb)->GetDef()->Indexable()) {
-    sprintf(g->Message, "Table %s is not indexable", ptdb->GetName());
+    sprintf(g->Message, "CntIndexInit: Table %s is not indexable", ptdb->GetName());
     return 0;
   } else
     tdbp= (PTDBDOX)ptdb;
@@ -685,6 +685,7 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
   char   *kp= (char*)key;
   int     n;
   short   lg;
+  bool    rcb;
   RCODE   rc;
   PVAL    valp;
   PCOL    colp;
@@ -694,7 +695,7 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
   if (!ptdb)
     return RC_FX;
   if (!((PTDBASE)ptdb)->GetDef()->Indexable()) {
-    sprintf(g->Message, "Table %s is not indexable", ptdb->GetName());
+    sprintf(g->Message, "CntIndexRead: Table %s is not indexable", ptdb->GetName());
     return RC_FX;
   } else
     tdbp= (PTDBDOX)ptdb;
@@ -719,9 +720,20 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
         if (colp->GetColUse(U_VAR)) {
           lg= *(short*)kp;
           kp+= sizeof(short);
-          valp->SetValue_char(kp, (int)lg);
+          rcb= valp->SetValue_char(kp, (int)lg);
         } else
-          valp->SetValue_char(kp, valp->GetClen());
+          rcb= valp->SetValue_char(kp, valp->GetClen());
+
+        if (rcb) {
+          if (tdbp->RowNumber(g))
+            sprintf(g->Message, "Out of range value for column %s at row %d",
+                    colp->GetName(), tdbp->RowNumber(g));
+          else
+            sprintf(g->Message, "Out of range value for column %s",
+                    colp->GetName());
+
+          PushWarning(g, tdbp);
+          } // endif b
 
       } else
         valp->SetBinValue((void*)kp);
@@ -759,7 +771,7 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
   const uchar *p, *kp;
   int     i, n, k[2];
   short   lg;
-  bool    b;
+  bool    b, rcb;
   PVAL    valp;
   PCOL    colp;
   PTDBDOX tdbp;
@@ -768,7 +780,7 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
   if (!ptdb)
     return -1;
   else if (!((PTDBASE)ptdb)->GetDef()->Indexable()) {
-    sprintf(g->Message, "Table %s is not indexable", ptdb->GetName());
+    sprintf(g->Message, "CntIndexRange: Table %s is not indexable", ptdb->GetName());
     DBUG_PRINT("Range", ("%s", g->Message));
     return -1;
   } else
@@ -802,9 +814,21 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
             if (colp->GetColUse(U_VAR)) {
               lg= *(short*)p;
               p+= sizeof(short);
-              valp->SetValue_char((char*)p, (int)lg);
+              rcb= valp->SetValue_char((char*)p, (int)lg);
             } else
-              valp->SetValue_char((char*)p, valp->GetClen());
+              rcb= valp->SetValue_char((char*)p, valp->GetClen());
+
+          if (rcb) {
+            if (tdbp->RowNumber(g))
+              sprintf(g->Message, 
+                      "Out of range value for column %s at row %d",
+                      colp->GetName(), tdbp->RowNumber(g));
+            else
+              sprintf(g->Message, "Out of range value for column %s",
+                      colp->GetName());
+
+            PushWarning(g, tdbp);
+            } // endif b
 
           } else
             valp->SetBinValue((void*)p);

storage/connect/mycat.cc

@@ -172,21 +172,6 @@ bool IsTypeNullable(TABTYPE type)
   {
   bool nullable;
 
-#if 0
-  switch (type) {                      
-    case TAB_ODBC:
-    case TAB_MYSQL:
-    case TAB_TBL:
-    case TAB_INI:
-    case TAB_XML:
-      nullable= true;
-      break;
-    default:
-      nullable= false;
-      break;
-    } // endswitch type
-#endif // 0
-
   switch (type) {                      
     case TAB_MAC:
     case TAB_DIR:
@@ -222,6 +207,31 @@ bool IsTypeFixed(TABTYPE type)
   return fix;
   } // end of IsTypeFixed
 
+/***********************************************************************/
+/*  Return true for table types with fix length records.               */
+/***********************************************************************/
+bool IsTypeIndexable(TABTYPE type)
+  {
+  bool idx;
+
+  switch (type) {                      
+    case TAB_DOS:
+    case TAB_CSV:
+    case TAB_FMT:
+    case TAB_FIX:
+    case TAB_BIN:
+    case TAB_VEC:
+    case TAB_DBF:
+      idx= true;
+      break;
+    default:
+      idx= false;
+      break;
+    } // endswitch type
+
+  return idx;
+  } // end of IsTypeIndexable
+
 /***********************************************************************/
 /*  Get a unique enum catalog function ID.                             */
 /***********************************************************************/

storage/connect/mycat.h

@@ -38,6 +38,7 @@ TABTYPE GetTypeID(const char *type);
 bool    IsFileType(TABTYPE type);
 bool    IsTypeNullable(TABTYPE type);
 bool    IsTypeFixed(TABTYPE type);
+bool    IsTypeIndexable(TABTYPE type);
 uint    GetFuncID(const char *func);
 
 /***********************************************************************/

storage/connect/myconn.cpp

@@ -46,21 +46,6 @@
 #define  DLL_EXPORT            // Items are exported from this DLL
 #include "myconn.h"
 
-#if defined(EMBEDDED)
-static char *server_args[] = {
-  "this_program",       /* this string is not used */
-  "--skip-bdb",
-  "--skip-innodb"
-  };
-
-static char *server_groups[] = {
-  "PlugDB_SERVER",
-  "embedded",
-  "server",
-  (char *)NULL
-  };
-#endif   // EMBEDDED
-
 extern "C" int   trace;
 extern MYSQL_PLUGIN_IMPORT uint mysqld_port;
 
@@ -82,12 +67,12 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
   {
   static int  buftyp[] = {TYPE_STRING, TYPE_SHORT,  TYPE_STRING, TYPE_INT,
                           TYPE_STRING, TYPE_SHORT,  TYPE_SHORT,  TYPE_SHORT,
-                          TYPE_STRING, TYPE_STRING, TYPE_STRING};
+                          TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING};
   static XFLD fldtyp[] = {FLD_NAME, FLD_TYPE,  FLD_TYPENAME, FLD_PREC,
                           FLD_KEY,  FLD_SCALE, FLD_RADIX,    FLD_NULL,
-                          FLD_REM,  FLD_NO,    FLD_CHARSET};
-  static unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 256, 32, 32};
-  char   *fld, *fmt, v, cmd[128];
+                          FLD_REM,  FLD_NO,    FLD_DEFAULT,  FLD_CHARSET};
+  static unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 0, 32};
+  char   *fld, *fmt, v, cmd[128], uns[16], zero[16];
   int     i, n, nf, ncol = sizeof(buftyp) / sizeof(int);
   int     len, type, prec, rc, k = 0;
   PQRYRES qrp;
@@ -122,9 +107,10 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
       } // endif n
 
     /********************************************************************/
-    /*  Get the size of the name columns.                               */
+    /*  Get the size of the name and default columns.                   */
     /********************************************************************/
     length[0] = myc.GetFieldLength(0);
+    length[10] = myc.GetFieldLength(5);
   } else {
     n = 0;
     length[0] = 128;
@@ -164,18 +150,29 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
     crp = qrp->Colresp;                    // Column_Name
     crp->Kdata->SetValue(fld, i);
 
-    // Get type, type name, and precision
+    // Get type, type name, precision, unsigned and zerofill
     fld = myc.GetCharField(1);
     prec = 0;
     len = 0;
     v = 0;
+    *uns = 0;
+    *zero = 0;
 
-    if ((nf = sscanf(fld, "%[^(](%d,%d", cmd, &len, &prec)) < 1) {
+    switch ((nf = sscanf(fld, "%[^(](%d,%d", cmd, &len, &prec))) {
+      case 3:
+        nf = sscanf(fld, "%[^(](%d,%d) %s %s", cmd, &len, &prec, uns, zero);
+        break;
+      case 2:
+        nf = sscanf(fld, "%[^(](%d) %s %s", cmd, &len, uns, zero) + 1;
+        break;
+      case 1:
+        nf = sscanf(fld, "%s %s %s", cmd, uns, zero) + 2;
+        break;
+      default:
         sprintf(g->Message, MSG(BAD_FIELD_TYPE), fld);
         myc.Close();
         return NULL;
-    } else
-      qrp->Nblin++;
+      } // endswitch nf
 
     if ((type = MYSQLtoPLG(cmd, &v)) == TYPE_ERROR) {
       sprintf(g->Message, "Unsupported column type %s", cmd);
@@ -184,9 +181,16 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
     } else if (type == TYPE_STRING)
       len = min(len, 4096);
 
+    qrp->Nblin++;
     crp = crp->Next;                       // Data_Type
     crp->Kdata->SetValue(type, i);
-    crp->Nulls[i] = v;
+
+    switch (nf) {
+      case 5:  crp->Nulls[i] = 'Z'; break;
+      case 4:  crp->Nulls[i] = 'U'; break;
+      default: crp->Nulls[i] = v;   break;
+      } // endswitch nf
+
     crp = crp->Next;                       // Type_Name
     crp->Kdata->SetValue(cmd, i);
 
@@ -200,7 +204,7 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
     crp = crp->Next;                       // Precision
     crp->Kdata->SetValue(len, i);
 
-    crp = crp->Next;                       // was Length
+    crp = crp->Next;                       // key (was Length)
     fld = myc.GetCharField(4);
     crp->Kdata->SetValue(fld, i);
 
@@ -218,9 +222,13 @@ PQRYRES MyColumns(PGLOBAL g, const char *host, const char *db,
     fld = myc.GetCharField(8);
     crp->Kdata->SetValue(fld, i);
 
-    crp = crp->Next;                       // New
+    crp = crp->Next;                       // Date format
     crp->Kdata->SetValue((fmt) ? fmt : (char*) "", i);
 
+    crp = crp->Next;                       // New (default)
+    fld = myc.GetCharField(5);
+    crp->Kdata->SetValue(fld, i);
+
     crp = crp->Next;                       // New (charset)
     fld = myc.GetCharField(2);
     crp->Kdata->SetValue(fld, i);
@@ -657,6 +665,7 @@ PQRYRES MYSQLC::GetResult(PGLOBAL g, bool pdb)
   {
   char        *fmt;
   int          n;
+  bool         uns;
   PCOLRES     *pcrp, crp;
   PQRYRES      qrp;
   MYSQL_FIELD *fld;
@@ -707,9 +716,10 @@ PQRYRES MYSQLC::GetResult(PGLOBAL g, bool pdb)
     crp->Prec = (crp->Type == TYPE_FLOAT) ? fld->decimals : 0;
     crp->Length = fld->max_length;
     crp->Clen = GetTypeSize(crp->Type, crp->Length);
+    uns = (fld->flags & (UNSIGNED_FLAG | ZEROFILL_FLAG)) ? true : false;
 
     if (!(crp->Kdata = AllocValBlock(g, NULL, crp->Type, m_Rows,
-                                     crp->Clen, 0, FALSE, TRUE, FALSE))) {
+                                     crp->Clen, 0, FALSE, TRUE, uns))) {
       sprintf(g->Message, MSG(INV_RESULT_TYPE),
                           GetFormatType(crp->Type));
       return NULL;

storage/connect/mysql-test/connect/my.cnf

@@ -13,3 +13,5 @@ MASTER_MYSOCK=           @mysqld.1.socket
 
 SLAVE_MYPORT=            @mysqld.2.port
 SLAVE_MYSOCK=            @mysqld.2.socket
+
+PGCLIENTENCODING=        UTF8

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

@@ -238,3 +238,38 @@ CREATE TABLE `t2` (
 # End of mysqldump ------
 DROP TABLE t2;
 DROP TABLE t1;
+#
+# Testing getting unsigned types
+#
+CREATE TABLE t1 (
+a TINYINT UNSIGNED NOT NULL,
+b SMALLINT ZEROFILL NOT NULL,
+c INT UNSIGNED NOT NULL,
+d BIGINT UNSIGNED NOT NULL,
+e CHAR(32) NOT NULL DEFAULT 'Hello') ENGINE=CONNECT TABLE_TYPE=FIX;
+Warnings:
+Warning	1105	No file name. Table will use t1.fix
+DESCRIBE t1;
+Field	Type	Null	Key	Default	Extra
+a	tinyint(3) unsigned	NO		NULL	
+b	smallint(5) unsigned zerofill	NO		NULL	
+c	int(10) unsigned	NO		NULL	
+d	bigint(20) unsigned	NO		NULL	
+e	char(32)	NO		Hello	
+INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615);
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	Hello
+CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME=t1;
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	tinyint(3) unsigned	NO		NULL	
+b	smallint(5) unsigned zerofill	NO		NULL	
+c	int(10) unsigned	NO		NULL	
+d	bigint(20) unsigned	NO		NULL	
+e	char(32)	NO		Hello	
+SELECT * FROM t2;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	Hello
+DROP TABLE t2;
+DROP TABLE t1;

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

@@ -13,19 +13,13 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(20) NOT NULL,
-  `group` int(11) NOT NULL,
-  `a\\b` int(11) NOT NULL,
-  `a\\` int(10) DEFAULT NULL,
-  `name` varchar(32) DEFAULT NULL
+  `group` int(11) NOT NULL DEFAULT '1',
+  `a\\b` int(11) NOT NULL DEFAULT '2',
+  `a\\` int(10) unsigned DEFAULT NULL,
+  `name` varchar(32) DEFAULT 'name'
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1' `TABLE_TYPE`='MYSQL'
 INSERT INTO t1 (id, name) VALUES (1, 'foo');
-Warnings:
-Warning	1364	Field 'group' doesn't have a default value
-Warning	1364	Field 'a\\b' doesn't have a default value
 INSERT INTO t1 (id, name) VALUES (2, 'fee');
-Warnings:
-Warning	1364	Field 'group' doesn't have a default value
-Warning	1364	Field 'a\\b' doesn't have a default value
 SELECT * FROM t1;
 id	group	a\\b	a\\	name
 1	1	2	NULL	foo

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

@@ -204,7 +204,7 @@ t1	CREATE TABLE `t1` (
   `a` date DEFAULT NULL,
   `b` datetime DEFAULT NULL,
   `c` time DEFAULT NULL,
-  `d` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `e` year(4) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL'
 SELECT * FROM t1;

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

+SET NAMES utf8;
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='Bad connection string';
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `Name` varchar(256) NOT NULL,
+  `Description` varchar(256) NOT NULL
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
+DROP TABLE t1;
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `Description` char(128) NOT NULL,
+  `Attributes` varchar(256) NOT NULL
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers'
+DROP TABLE t1;
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Tables CONNECTION='Not important';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `Table_Qualifier` char(128) NOT NULL,
+  `Table_Owner` char(128) NOT NULL,
+  `Table_Name` char(128) NOT NULL,
+  `Table_Type` char(16) NOT NULL,
+  `Remark` char(128) NOT NULL
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Tables'
+DROP TABLE t1;
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Columns CONNECTION='Not important';
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `Table_Qualif` char(128) NOT NULL,
+  `Table_Owner` char(128) NOT NULL,
+  `Table_Name` char(128) NOT NULL,
+  `Column_Name` char(128) NOT NULL,
+  `Data_Type` smallint(6) NOT NULL,
+  `Type_Name` char(20) NOT NULL,
+  `Precision` int(10) NOT NULL,
+  `Length` int(10) NOT NULL,
+  `Scale` smallint(6) NOT NULL,
+  `Radix` smallint(6) NOT NULL,
+  `Nullable` smallint(6) NOT NULL,
+  `Remarks` char(128) NOT NULL
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Columns'
+DROP TABLE t1;

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

+#
+# Testing unsigned types
+#
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 'test.t1'
+CREATE TABLE t1 (
+a TINYINT UNSIGNED NOT NULL,
+b SMALLINT ZEROFILL NOT NULL,
+c INT UNSIGNED NOT NULL,
+d BIGINT UNSIGNED NOT NULL,
+e CHAR(32) NOT NULL DEFAULT '???') ENGINE=CONNECT TABLE_TYPE=FIX;
+Warnings:
+Warning	1105	No file name. Table will use t1.fix
+DESCRIBE t1;
+Field	Type	Null	Key	Default	Extra
+a	tinyint(3) unsigned	NO		NULL	
+b	smallint(5) unsigned zerofill	NO		NULL	
+c	int(10) unsigned	NO		NULL	
+d	bigint(20) unsigned	NO		NULL	
+e	char(32)	NO		???	
+INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615);
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	???
+UPDATE t1 SET e = d;
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	18446744073709551615
+UPDATE t1 SET c = d;
+Warnings:
+Warning	1264	Out of range value for column 'c' at row 1
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	18446744073709551615
+UPDATE t1 SET c = e;
+Warnings:
+Warning	1264	Out of range value for column 'c' at row 1
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	18446744073709551615
+UPDATE t1 SET d = e;
+SELECT * FROM t1;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	18446744073709551615
+DROP TABLE IF EXISTS t2;
+Warnings:
+Note	1051	Unknown table 'test.t2'
+CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=PROXY TABNAME=t1;
+DESCRIBE t2;
+Field	Type	Null	Key	Default	Extra
+a	tinyint(3) unsigned	NO		NULL	
+b	smallint(5) unsigned zerofill	NO		NULL	
+c	int(10) unsigned	NO		NULL	
+d	bigint(20) unsigned	NO		NULL	
+e	char(32)	NO		NULL	
+SELECT * FROM t2;
+a	b	c	d	e
+255	65535	4294967295	18446744073709551615	18446744073709551615
+DROP TABLE t2;
+DROP TABLE t1;

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

@@ -413,7 +413,7 @@ DROP TABLE t1;
 SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
 SELECT CAST(@a AS CHAR CHARACTER SET latin1);
 CAST(@a AS CHAR CHARACTER SET latin1)	<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Created by CONNECT Version 1.01.0009 October 29, 2013 -->
+<!-- Created by CONNECT Version 1.01.0010 November 30, 2013 -->
 <t1>
 	<line>
 		<node>ÀÁÂÃ</node>

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

+Warnings:
+Warning	1105	No file name. Table will use t1.xml
+SET NAMES utf8;
+CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+ERROR HY000: Table type XML is not indexable
+CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+DESCRIBE t1;
+Field	Type	Null	Key	Default	Extra
+i	int(11)	NO		NULL	
+ALTER TABLE t1 ADD UNIQUE(i);
+ERROR HY000: Table type XML is not indexable
+CREATE UNIQUE INDEX i ON t1(i);
+ERROR HY000: Table type XML is not indexable
+DESCRIBE t1;
+Field	Type	Null	Key	Default	Extra
+i	int(11)	NO		NULL	
+INSERT INTO t1 VALUES(2),(5),(7);
+SELECT * FROM t1 WHERE i = 5;
+i
+5
+ALTER TABLE t1 DROP INDEX i;
+ERROR 42000: Can't DROP 'i'; check that column/key exists
+DROP INDEX i ON t1;
+ERROR 42000: Can't DROP 'i'; check that column/key exists
+DROP TABLE t1;

storage/connect/mysql-test/connect/t/have_libxml2.inc

+--disable_query_log
+--error 0,ER_UNKNOWN_ERROR
+CREATE TABLE t1 (a VARCHAR(10))
+ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
+if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
+     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
+     AND ENGINE='CONNECT'
+     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
+     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
+{
+  DROP TABLE IF EXISTS t1;
+  Skip Need LIBXML2;
+}
+DROP TABLE t1;
+--enable_query_log
+
+

storage/connect/mysql-test/connect/t/have_odbc.inc

+--disable_query_log
+--error 0,ER_UNKNOWN_ERROR
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers;
+if ($mysql_errno)
+{
+  Skip No ODBC support;
+}
+DROP TABLE t1;
+--enable_query_log

storage/connect/mysql-test/connect/t/have_odbc_postgresql.inc

+--disable_query_log
+--error 0,ER_UNKNOWN_ERROR
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
+if ($mysql_errno)
+{
+  Skip No ODBC support;
+}
+if (!`SELECT count(*) FROM t1 WHERE Name='ConnectEnginePostgresql'`)
+{
+  DROP TABLE t1;
+  Skip Need ODBC data source ConnectEnginePostgresql;
+}
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+--enable_query_log

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

@@ -434,3 +434,23 @@ SELECT * FROM t2;
 --echo # End of mysqldump ------
 DROP TABLE t2;
 DROP TABLE t1;
+
+--echo #
+--echo # Testing getting unsigned types
+--echo #
+CREATE TABLE t1 (
+a TINYINT UNSIGNED NOT NULL,
+b SMALLINT ZEROFILL NOT NULL,
+c INT UNSIGNED NOT NULL,
+d BIGINT UNSIGNED NOT NULL,
+e CHAR(32) NOT NULL DEFAULT 'Hello') ENGINE=CONNECT TABLE_TYPE=FIX;
+DESCRIBE t1;
+INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615);
+SELECT * FROM t1;
+
+CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME=t1;
+DESCRIBE t2;
+SELECT * FROM t2;
+
+DROP TABLE t2;
+DROP TABLE t1;

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

+--source have_odbc.inc
+
+SET NAMES utf8;
+
+# MS ODBC and unixODBC return different error message text,
+# so disable displaying error messages
+--disable_result_log ONCE
+--error ER_UNKNOWN_ERROR
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='Bad connection string';
+
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Tables CONNECTION='Not important';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Columns CONNECTION='Not important';
+SHOW CREATE TABLE t1;
+DROP TABLE t1;

storage/connect/mysql-test/connect/t/odbc_postgresql.sql

+--
+-- The SQL script to create PostgreSQL data for odbc_postgresql.test
+--
+-- Run this script as a admin user:
+-- psql -U postgres < odbc_postgresql.sql
+
+SET NAMES 'UTF8';
+
+DROP DATABASE IF EXISTS mtr;
+DROP USER IF EXISTS mtr;
+
+CREATE USER mtr WITH PASSWORD 'mtr';
+CREATE DATABASE mtr OWNER=mtr ENCODING='UTF8';
+GRANT ALL ON DATABASE mtr TO mtr;
+\c mtr
+SET role mtr;
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (10),(20),(30);
+CREATE VIEW v1 AS SELECT * FROM t1;
+CREATE TABLE t2 (a INT NOT NULL);
+INSERT INTO t2 VALUES (40),(50),(60);
+CREATE SCHEMA schema1 AUTHORIZATION mtr;
+CREATE TABLE schema1.t1 (a CHAR(10) NOT NULL);
+INSERT INTO schema1.t1 VALUES ('aaa'),('bbb'),('ccc'),('яяя');
+CREATE VIEW schema1.v1 AS SELECT * FROM schema1.t1;
+CREATE TABLE schema1.t2 (a CHAR(10) NOT NULL);
+INSERT INTO schema1.t2 VALUES ('xxx'),('yyy'),('zzz'),('ÄÖÜ');

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

+--source have_odbc_postgresql.inc
+#--source include/not_embedded.inc
+
+#
+# To configure your system to be able to run this test,
+# follow through the following steps:
+#
+# 1. Install and configure PostgreSQL database to stat on the system startup
+#
+# 2. Create user, database, schema and tables to be used by mtr:
+#    psql -U postgres < odbc_postgresql.sql
+#
+# 3. Install PostgreSQL ODBC Driver.
+# - On CentOS, Fedora:
+#   sudo yum install postgresql-odbc
+# - On Ubuntu, Debian:
+#   sudo apt-get install odbc-postgresql
+#
+# 4. Create a data source with the name "ConnectEnginePostgresql"
+# - On Windows: use odbcadm.exe
+# - On Linux: put these lines into /etc/odbc.ini
+#
+#[ConnectEnginePostgresql]
+#Description=PostgreSQL DSN for ConnectSE
+#Driver=PostgreSQL
+#Database=mtr
+#Servername=localhost
+#Port=5432
+#
+
+SET NAMES utf8;
+
+--echo #
+--echo # Checking CATFUNC=Tables
+--echo #
+--echo
+--echo # All tables in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables;
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.%.%';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.%';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables in the default schema ("public")
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables "t1" in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.%.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables "t1" in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # Table "t1" in the default schema ("public")
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "public"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.public.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='%.schema1.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables "t1" in all schemas (Catalog name is ignored by PostgreSQL)
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Tables TABNAME='xxx.%.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo #
+--echo # Checking CATFUNC=Columns
+--echo #
+--echo
+
+#
+# For some reasons SQLColumn (unlike SQLTables) include columns of system
+# tables from the schemas like "information_schema", "pg_catalog", "pg_toast".
+# So we add the "Table_Owner IN ('public','schema1')" clause into some queries.
+#
+
+--echo # All columns in the schemas "public" and "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns;
+SELECT * FROM t1 WHERE Table_Owner IN ('public','schema1') ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All columns in the schemas "public" and "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.%.%';
+SELECT * FROM t1 WHERE Table_Owner IN ('public','schema1') ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables "t1" in all schemas
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.%.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "public"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.public.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.schema1.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+--echo # All tables "t1" in all schemas (Catalog name is ignored by PostgreSQL)
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='xxx.%.t1';
+SELECT * FROM t1 ORDER BY Table_Owner, Table_Name;
+DROP TABLE t1;
+
+
+--echo #
+--echo # Checking tables
+--echo #
+--echo
+
+--echo # Table "t1" in the default schema ("public")
+CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+CREATE TABLE t2 AS SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+SELECT * FROM t2;
+DROP TABLE t2;
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT * FROM v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "public"
+CREATE TABLE t1 ENGINE=CONNECT TABNAME='public.t1' TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+DROP TABLE t1;
+
+--echo # Table "t1" in the schema "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABNAME='schema1.t1' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+CREATE TABLE t2 AS SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+SELECT * FROM t2;
+DROP TABLE t2;
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT * FROM v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo # View "v1" in the schema "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABNAME='schema1.v1' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+CREATE TABLE t2 AS SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+SELECT * FROM t2;
+DROP TABLE t2;
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT * FROM v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo # Table "t2" in the schema "schema1"
+CREATE TABLE t1 ENGINE=CONNECT TABNAME='schema1.t2' CHARSET=utf8 DATA_CHARSET=utf8 TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEnginePostgresql;UID=mtr;PWD=mtr';
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+CREATE TABLE t2 AS SELECT * FROM t1;
+SHOW CREATE TABLE t2;
+SELECT * FROM t2;
+DROP TABLE t2;
+
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT * FROM v1;
+DROP VIEW v1;
+DROP TABLE t1;

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

@@ -77,3 +77,14 @@ DROP TABLE t1;
 --eval CREATE TABLE t1 ENGINE=CONNECT CATFUNC=Tables TABNAME='t1' TABLE_TYPE=ODBC CONNECTION='Driver=SQLite3 ODBC Driver;Database=$Database;NoWCHAR=yes' CHARSET=utf8 DATA_CHARSET=utf8
 SELECT * FROM t1;
 DROP TABLE t1;
+
+
+--replace_result $MTR_SUITE_DIR MTR_SUITE_DIR
+--eval CREATE TABLE t1 ENGINE=CONNECT CATFUNC=Columns TABLE_TYPE=ODBC CONNECTION='Driver=SQLite3 ODBC Driver;Database=$Database;NoWCHAR=yes' CHARSET=utf8 DATA_CHARSET=utf8
+SELECT * FROM t1 ORDER BY Table_name;
+DROP TABLE t1;
+
+--replace_result $MTR_SUITE_DIR MTR_SUITE_DIR
+--eval CREATE TABLE t1 ENGINE=CONNECT CATFUNC=Tables TABLE_TYPE=ODBC CONNECTION='Driver=SQLite3 ODBC Driver;Database=$Database;NoWCHAR=yes' CHARSET=utf8 DATA_CHARSET=utf8
+SELECT * FROM t1 ORDER BY Table_name;
+DROP TABLE t1;

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

+--echo #
+--echo # Testing unsigned types
+--echo #
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+a TINYINT UNSIGNED NOT NULL,
+b SMALLINT ZEROFILL NOT NULL,
+c INT UNSIGNED NOT NULL,
+d BIGINT UNSIGNED NOT NULL,
+e CHAR(32) NOT NULL DEFAULT '???') ENGINE=CONNECT TABLE_TYPE=FIX;
+DESCRIBE t1;
+INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615);
+SELECT * FROM t1;
+UPDATE t1 SET e = d;
+SELECT * FROM t1;
+UPDATE t1 SET c = d;
+SELECT * FROM t1;
+UPDATE t1 SET c = e;
+SELECT * FROM t1;
+UPDATE t1 SET d = e;
+SELECT * FROM t1;
+
+DROP TABLE IF EXISTS t2;
+CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=PROXY TABNAME=t1;
+DESCRIBE t2;
+SELECT * FROM t2;
+
+# Moved to mysql.test (cannot be executed if embedded)
+#DROP TABLE t2;
+#CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME=t1;
+#DESCRIBE t2;
+#SELECT * FROM t2;
+
+DROP TABLE t2;
+DROP TABLE t1;

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

---disable_query_log
---error 0,ER_UNKNOWN_ERROR
-CREATE TABLE t1 (a VARCHAR(10))
-ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
-if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
-     AND ENGINE='CONNECT'
-     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
-     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
-{
-  Skip Need LIBXML2;
-}
-DROP TABLE t1;
---enable_query_log
-
+--source have_libxml2.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 

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

 -- source include/not_embedded.inc
-
---disable_query_log
---error 0,ER_UNKNOWN_ERROR
-CREATE TABLE t1 (a VARCHAR(10))
-ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
-if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
-     AND ENGINE='CONNECT'
-     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
-     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
-{
-  Skip Need LIBXML2;
-}
-DROP TABLE t1;
---enable_query_log
-
+-- source have_libxml2.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 

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

+--source have_libxml2.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+SET NAMES utf8;
+
+#
+#--echo Testing indexing on not indexable table type
+#
+--error ER_UNKNOWN_ERROR
+CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+DESCRIBE t1;
+# one could *add* an index to an existing table
+--error ER_UNKNOWN_ERROR
+ALTER TABLE t1 ADD UNIQUE(i);
+--error ER_UNKNOWN_ERROR
+CREATE UNIQUE INDEX i ON t1(i);
+DESCRIBE t1;
+INSERT INTO t1 VALUES(2),(5),(7);
+SELECT * FROM t1 WHERE i = 5;
+--error ER_CANT_DROP_FIELD_OR_KEY
+ALTER TABLE t1 DROP INDEX i;
+--error ER_CANT_DROP_FIELD_OR_KEY
+DROP INDEX i ON t1;
+DROP TABLE t1;
+--remove_file $MYSQLD_DATADIR/test/xt1.xml

storage/connect/myutil.cpp

@@ -84,7 +84,7 @@ int MYSQLtoPLG(char *typname, char *var)
 /************************************************************************/
 /*  Convert from PlugDB type to MySQL type number                       */
 /************************************************************************/
-enum enum_field_types PLGtoMYSQL(int type, bool dbf)
+enum enum_field_types PLGtoMYSQL(int type, bool dbf, char v)
   {
   enum enum_field_types mytype;
 
@@ -99,10 +99,14 @@ enum enum_field_types PLGtoMYSQL(int type, bool dbf)
       mytype = MYSQL_TYPE_DOUBLE;
       break;
     case TYPE_DATE:
-      mytype = (dbf) ? MYSQL_TYPE_DATE : MYSQL_TYPE_DATETIME;
+      mytype = (dbf) ? MYSQL_TYPE_DATE :
+          (v == 'S') ? MYSQL_TYPE_TIMESTAMP :
+          (v == 'D') ? MYSQL_TYPE_NEWDATE :
+          (v == 'T') ? MYSQL_TYPE_TIME :
+          (v == 'Y') ? MYSQL_TYPE_YEAR : MYSQL_TYPE_DATETIME;
       break;
     case TYPE_STRING:
-      mytype = MYSQL_TYPE_VARCHAR;
+      mytype = (v) ? MYSQL_TYPE_VARCHAR : MYSQL_TYPE_STRING;
       break;
     case TYPE_BIGINT:
       mytype = MYSQL_TYPE_LONGLONG;
@@ -138,12 +142,12 @@ const char *PLGtoMYSQLtype(int type, bool dbf, char v)
     } // endswitch mytype
 
   return "CHAR(0)";
-  } // end of PLGtoMYSQL
+  } // end of PLGtoMYSQLtype
 
 /************************************************************************/
 /*  Convert from MySQL type to PlugDB type number                       */
 /************************************************************************/
-int MYSQLtoPLG(int mytype)
+int MYSQLtoPLG(int mytype, char *var)
   {
   int type;
 
@@ -177,7 +181,6 @@ int MYSQLtoPLG(int mytype)
     case MYSQL_TYPE_TIME:
       type = TYPE_DATE;
       break;
-    case MYSQL_TYPE_STRING:
     case MYSQL_TYPE_VAR_STRING:
 #if !defined(ALPHA)
     case MYSQL_TYPE_VARCHAR:
@@ -186,6 +189,8 @@ int MYSQLtoPLG(int mytype)
     case MYSQL_TYPE_TINY_BLOB:
     case MYSQL_TYPE_MEDIUM_BLOB:
     case MYSQL_TYPE_LONG_BLOB:
+      if (var) *var = 'V';
+    case MYSQL_TYPE_STRING:
       type = TYPE_STRING;
       break;
     default:

storage/connect/myutil.h

@@ -4,10 +4,10 @@
 #ifndef __MYUTIL__H
 #define  __MYUTIL__H
 
-enum enum_field_types PLGtoMYSQL(int type, bool dbf);
-const char *PLGtoMYSQLtype(int type, bool dbf, char var = NULL);
+enum enum_field_types PLGtoMYSQL(int type, bool dbf, char var = 0);
+const char *PLGtoMYSQLtype(int type, bool dbf, char var = 0);
 int   MYSQLtoPLG(char *typname, char *var = NULL);
-int   MYSQLtoPLG(int mytype);
+int   MYSQLtoPLG(int mytype, char *var = NULL);
 char *MyDateFmt(int mytype);
 char *MyDateFmt(char *typname);
 

storage/connect/odbconn.cpp

@@ -121,7 +121,7 @@ int TranslateSQLType(int stp, int prec, int& len, char& v)
     case SQL_LONGVARCHAR:                   //  (-1)
       v = 'V';
       type = TYPE_STRING;
-      len = min(abs(len), 255);
+      len = min(abs(len), 256);
       break;
     case SQL_NUMERIC:                       //    2
     case SQL_DECIMAL:                       //    3
@@ -226,10 +226,10 @@ static CATPARM *AllocCatInfo(PGLOBAL g, CATINFO fid, char *tab, PQRYRES qrp)
   cap->Id = fid;
   cap->Qrp = qrp;
   cap->Tab = (PUCHAR)tab;
-  cap->Vlen = (SQLLEN* *)PlugSubAlloc(g, NULL, n * sizeof(SDWORD *));
+  cap->Vlen = (SQLLEN* *)PlugSubAlloc(g, NULL, n * sizeof(SQLLEN *));
 
   for (i = 0; i < n; i++)
-    cap->Vlen[i] = (SQLLEN *)PlugSubAlloc(g, NULL, m * sizeof(SDWORD));
+    cap->Vlen[i] = (SQLLEN *)PlugSubAlloc(g, NULL, m * sizeof(SQLLEN));
 
   cap->Status = (UWORD *)PlugSubAlloc(g, NULL, m * sizeof(UWORD));
   return cap;
@@ -557,7 +557,7 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *tabpat, bool info)
     if (ocp->Open(dsn, 2) < 1)        // 2 is openReadOnly
       return NULL;
 
-    maxres = 512;                       // This is completely arbitrary
+    maxres = 16384;                   // This is completely arbitrary
     n = ocp->GetMaxValue(SQL_MAX_QUALIFIER_NAME_LEN);
     length[0] = (n) ? (n + 1) : 128;
     n = ocp->GetMaxValue(SQL_MAX_USER_NAME_LEN);
@@ -1123,10 +1123,10 @@ bool ODBConn::Connect(DWORD Options)
   PGLOBAL& g = m_G;
   PDBUSER dup = PlgGetUser(g);
 
-  if (Options & noOdbcDialog || dup->Remote)
+//if (Options & noOdbcDialog || dup->Remote)
     wConnectOption = SQL_DRIVER_NOPROMPT;
-  else if (Options & forceOdbcDialog)
-    wConnectOption = SQL_DRIVER_PROMPT;
+//else if (Options & forceOdbcDialog)
+//  wConnectOption = SQL_DRIVER_PROMPT;
 
   rc = SQLDriverConnect(m_hdbc, hWnd, (PUCHAR)m_Connect,
                         SQL_NTS, ConnOut, MAX_CONNECT_LEN,
@@ -1986,6 +1986,87 @@ bool ODBConn::GetDrivers(PQRYRES qrp)
   return rv;
   } // end of GetDrivers
 
+
+/**
+  A helper class to split an optionally qualified table name into components.
+  These formats are understood:
+    "CatalogName.SchemaName.TableName"
+    "SchemaName.TableName"
+    "TableName"
+*/
+class SQLQualifiedName
+{
+  static const uint max_parts= 3; /* Catalog.Schema.Table */
+  MYSQL_LEX_STRING m_part[max_parts];
+  char m_buf[512];
+  void lex_string_set(MYSQL_LEX_STRING *S, char *str, size_t length)
+  {
+    S->str= str;
+    S->length= length;
+  }
+  void lex_string_shorten_down(MYSQL_LEX_STRING *S, size_t offs)
+  {
+    DBUG_ASSERT(offs <= S->length);
+    S->str+= offs;
+    S->length-= offs;
+  }
+  /*
+    Find the rightmost '.' delimiter and return the length
+    of the qualifier, including the rightmost '.' delimier.
+    For example, for the string {"a.b.c",5} it will return 4,
+    which is the length of the qualifier "a.b."
+  */
+  size_t lex_string_find_qualifier(MYSQL_LEX_STRING *S)
+  {
+    size_t i;
+    for (i= S->length; i > 0; i--)
+    {
+      if (S->str[i - 1] == '.')
+      {
+        S->str[i - 1]= '\0';
+        return i;
+      }
+    }
+    return 0;
+  }
+public:
+  /*
+    Initialize to the given optionally qualified name.
+    NULL pointer in "name" is supported.
+  */
+  SQLQualifiedName(const char *name)
+  {
+    size_t len, i= 0;
+    if (!name)
+      goto ret;
+    /* Initialize the first (rightmost) part */
+    lex_string_set(&m_part[0], m_buf,
+                   strmake(m_buf, name, sizeof(m_buf) - 1) - m_buf);
+    /* Initialize the other parts, if exist. */
+    for (i= 1; i < max_parts; i++)
+    {
+      if (!(len= lex_string_find_qualifier(&m_part[i - 1])))
+        break;
+      lex_string_set(&m_part[i], m_part[i - 1].str, len - 1);
+      lex_string_shorten_down(&m_part[i - 1], len);
+    }
+ret:
+    /* Initialize the remaining parts */
+    for ( ; i < max_parts; i++)
+      lex_string_set(&m_part[i], NULL, 0);
+  }
+  SQLCHAR *ptr(uint i)
+  {
+    DBUG_ASSERT(i < max_parts);
+    return (SQLCHAR *) (m_part[i].length ? m_part[i].str : NULL);
+  }
+  size_t length(uint i)
+  {
+    DBUG_ASSERT(i < max_parts);
+    return m_part[i].length;
+  }
+};
+
 /***********************************************************************/
 /*  Allocate recset and call SQLTables, SQLColumns or SQLPrimaryKeys.  */
 /***********************************************************************/
@@ -2048,29 +2129,38 @@ int ODBConn::GetCatInfo(CATPARM *cap)
     } else
       ThrowDBX("0-sized result");
 
+    SQLQualifiedName name((const char *) cap->Tab);
     // Now do call the proper ODBC API
     switch (cap->Id) {
       case CAT_TAB:
 //      rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
 //                                (SQLPOINTER)false, 0);
         fnc = "SQLTables";
-        rc = SQLTables(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
+        rc = SQLTables(hstmt, name.ptr(2), name.length(2),
+                              name.ptr(1), name.length(1),
+                              name.ptr(0), name.length(0),
                               cap->Pat, SQL_NTS);
         break;
       case CAT_COL:
 //      rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
 //                                (SQLPOINTER)true, 0);
         fnc = "SQLColumns";
-        rc = SQLColumns(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
+        rc = SQLColumns(hstmt, name.ptr(2), name.length(2),
+                               name.ptr(1), name.length(1),
+                               name.ptr(0), name.length(0),
                                cap->Pat, SQL_NTS);
         break;
       case CAT_KEY:
         fnc = "SQLPrimaryKeys";
-        rc = SQLPrimaryKeys(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS);
+        rc = SQLPrimaryKeys(hstmt, name.ptr(2), name.length(2),
+                                   name.ptr(1), name.length(1),
+                                   name.ptr(0), name.length(0));
         break;
       case CAT_STAT:
         fnc = "SQLStatistics";
-        rc = SQLStatistics(hstmt, NULL, 0, NULL, 0, cap->Tab, SQL_NTS,
+        rc = SQLStatistics(hstmt, name.ptr(2), name.length(2),
+                                  name.ptr(1), name.length(1),
+                                  name.ptr(0), name.length(0),
                                   cap->Unique, cap->Accuracy);
         break;
       case CAT_SPC:
@@ -2088,7 +2178,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
 
     if (m_RowsetSize == 1 && cap->Qrp->Maxres > 1) {
       pval = (PVAL *)PlugSubAlloc(m_G, NULL, n * sizeof(PVAL));
-      vlen = (SQLLEN *)PlugSubAlloc(m_G, NULL, n * sizeof(SDWORD *));
+      vlen = (SQLLEN *)PlugSubAlloc(m_G, NULL, n * sizeof(SQLLEN *));
       } // endif
 
     // Now bind the column buffers

storage/connect/plgdbsem.h

@@ -330,7 +330,9 @@ enum COLUSE {U_P         = 0x01,      /* the projection list.          */
              U_VIRTUAL   = 0x20,      /* a VIRTUAL column              */
              U_NULLS     = 0x40,      /* The column may have nulls     */
              U_IS_NULL   = 0x80,      /* The column has a null value   */
-             U_SPECIAL   = 0x100};    /* The column is special         */
+             U_SPECIAL   = 0x100,     /* The column is special         */
+             U_UNSIGNED  = 0x200,     /* The column type is unsigned   */
+             U_ZEROFILL  = 0x400};    /* The column is zero filled     */
 
 /***********************************************************************/
 /*  DB description class and block pointer definitions.                */

storage/connect/plgdbutl.cpp

@@ -278,6 +278,18 @@ PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids,
   PCOLRES *pcrp, crp;
   PQRYRES  qrp;
 
+  // Save stack and allocation environment and prepare error return
+  if (g->jump_level == MAX_JUMP) {
+    strcpy(g->Message, MSG(TOO_MANY_JUMPS));
+    return NULL;
+    } // endif jump_level
+
+  if (setjmp(g->jumper[++g->jump_level]) != 0) {
+    printf("%s\n", g->Message);
+    qrp = NULL;
+    goto fin;
+    } // endif rc
+
   /************************************************************************/
   /*  Allocate the structure used to contain the result set.              */
   /************************************************************************/
@@ -342,6 +354,8 @@ PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids,
 
   *pcrp = NULL;
 
+ fin:
+  g->jump_level--;
   return qrp;
   } // end of PlgAllocResult
 

storage/connect/tabdos.cpp

@@ -1087,7 +1087,12 @@ void DOSCOL::ReadColumn(PGLOBAL g)
         case TYPE_SHORT:
         case TYPE_TINY:
         case TYPE_BIGINT:
-          Value->SetValue_char(p, field - Dcm);
+          if (Value->SetValue_char(p, field - Dcm)) {
+            sprintf(g->Message, "Out of range value for column %s at row %d",
+                    Name, tdbp->RowNumber(g));
+            PushWarning(g, tdbp);
+            } // endif SetValue_char
+
           break;
         case TYPE_FLOAT:
           Value->SetValue_char(p, field);
@@ -1104,7 +1109,11 @@ void DOSCOL::ReadColumn(PGLOBAL g)
         } // endswitch Buf_Type
 
       else
-        Value->SetValue_char(p, field);
+        if (Value->SetValue_char(p, field)) {
+          sprintf(g->Message, "Out of range value for column %s at row %d",
+                  Name, tdbp->RowNumber(g));
+          PushWarning(g, tdbp);
+          } // endif SetValue_char
 
       break;
     default:

storage/connect/tabfix.cpp

@@ -375,7 +375,12 @@ void BINCOL::ReadColumn(PGLOBAL g)
       Value->SetValue(*(double*)p);
       break;
     case 'C':                 // Text
-      Value->SetValue_char(p, Long);
+      if (Value->SetValue_char(p, Long)) {
+        sprintf(g->Message, "Out of range value for column %s at row %d",
+                Name, tdbp->RowNumber(g));
+        PushWarning(g, tdbp);
+        } // endif SetValue_char
+
       break;
     default:
       sprintf(g->Message, MSG(BAD_BIN_FMT), Fmt, Name);

storage/connect/table.cpp

@@ -556,6 +556,15 @@ bool TDBCAT::InitCol(PGLOBAL g)
   return false;
   } // end of InitCol
 
+/***********************************************************************/
+/*  SetRecpos: Replace the table at the specified position.            */
+/***********************************************************************/
+bool TDBCAT::SetRecpos(PGLOBAL g, int recpos) 
+  {
+  N = recpos - 1;
+  return false;
+  } // end of SetRecpos
+
 /***********************************************************************/
 /*  Data Base read routine for CAT access method.                      */
 /***********************************************************************/

storage/connect/tabmysql.cpp

@@ -1284,13 +1284,18 @@ void MYSQLCOL::ReadColumn(PGLOBAL g)
       htrc("MySQL ReadColumn: name=%s buf=%s\n", Name, buf);
 
     // TODO: have a true way to differenciate temporal values
-    if (strlen(buf) == 8)
+    if (Buf_Type == TYPE_DATE && strlen(buf) == 8)
       // This is a TIME value
       p = strcat(strcpy(tim, "1970-01-01 "), buf);
     else
       p = buf;
 
-    Value->SetValue_char(p, strlen(p));
+    if (Value->SetValue_char(p, strlen(p))) {
+      sprintf(g->Message, "Out of range value for column %s at row %d",
+              Name, tdbp->RowNumber(g));
+      PushWarning(g, tdbp);
+      } // endif SetValue_char
+
   } else {
     if (Nullable)
       Value->SetNull(true);

storage/connect/tabodbc.cpp

@@ -1083,7 +1083,7 @@ void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows)
     } // endelse
 
   if (rows > 1)
-    StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(int));
+    StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(SQLLEN));
 
   } // end of AllocateBuffers
 

storage/connect/tabutil.cpp

@@ -117,7 +117,7 @@ TABLE_SHARE *GetTableShare(PGLOBAL g, THD *thd, const char *db,
 
 /************************************************************************/
 /*  TabColumns: constructs the result blocks containing all the columns */
-/*  of the object table that will be retrieved by GetData commands.     */
+/*  description of the object table that will be retrieved by discovery.*/
 /************************************************************************/
 PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db, 
                                         const char *name, bool& info)
@@ -128,8 +128,8 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
   static XFLD fldtyp[] = {FLD_NAME,   FLD_TYPE,  FLD_TYPENAME, FLD_PREC,
                           FLD_LENGTH, FLD_SCALE, FLD_RADIX,    FLD_NULL,
                           FLD_REM,    FLD_NO,    FLD_CHARSET};
-  static unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 256, 32, 32};
-  char        *fld, *fmt;
+  static unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 32};
+  char        *fld, *fmt, v;
   int          i, n, ncol = sizeof(buftyp) / sizeof(int);
   int          len, type, prec;
   bool         mysql;
@@ -164,6 +164,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
   // Some columns must be renamed
   for (i = 0, crp = qrp->Colresp; crp; crp = crp->Next)
     switch (++i) {
+      case  2: crp->Nulls = (char*)PlugSubAlloc(g, NULL, n); break;
       case 10: crp->Name = "Date_fmt";  break;
       case 11: crp->Name = "Collation"; break;
       } // endswitch i
@@ -181,8 +182,9 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
     crp = qrp->Colresp;                    // Column_Name
     fld = (char *)fp->field_name;
     crp->Kdata->SetValue(fld, i);
+    v = 0;
 
-    if ((type = MYSQLtoPLG(fp->type())) == TYPE_ERROR) {
+    if ((type = MYSQLtoPLG(fp->type(), &v)) == TYPE_ERROR) {
       sprintf(g->Message, "Unsupported column type %s", GetTypeName(type));
       qrp = NULL;
       break;
@@ -190,6 +192,14 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
 
     crp = crp->Next;                       // Data_Type
     crp->Kdata->SetValue(type, i);
+
+    if (fp->flags & ZEROFILL_FLAG)
+      crp->Nulls[i] = 'Z';
+    else if (fp->flags & UNSIGNED_FLAG)
+      crp->Nulls[i] = 'U';
+    else
+      crp->Nulls[i] = v;
+
     crp = crp->Next;                       // Type_Name
     crp->Kdata->SetValue(GetTypeName(type), i);
 
@@ -212,10 +222,10 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
     crp->Kdata->SetValue(len, i);
 
     crp = crp->Next;                       // Length
-    len = fp->field_length;
+    prec = (type == TYPE_FLOAT) ? fp->decimals() : 0;
+    len = (prec == 31) ? 0 : fp->field_length;
     crp->Kdata->SetValue(len, i);
 
-    prec = (type == TYPE_FLOAT) ? fp->decimals() : 0;
     crp = crp->Next;                       // Scale
     crp->Kdata->SetValue(prec, i);
 
@@ -233,7 +243,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
     else
       crp->Kdata->Reset(i);
 
-    crp = crp->Next;                       // New
+    crp = crp->Next;                       // New (date format)
     crp->Kdata->SetValue((fmt) ? fmt : (char*) "", i);
 
     crp = crp->Next;                       // New (charset)

storage/connect/user_connect.cc

@@ -95,7 +95,8 @@ bool user_connect::user_init()
   PDBUSER   dup= NULL;
 
   // Areasize= 64M because of VEC tables. Should be parameterisable
-  g= PlugInit(NULL, 67108864);       
+//g= PlugInit(NULL, 67108864);       
+	g= PlugInit(NULL, 134217728);  // 128M because of embedded tests (???)     
 
   // Check whether the initialization is complete
   if (!g || !g->Sarea || PlugSubSet(g, g->Sarea, g->Sarea_Size)

storage/connect/valblk.h

@@ -45,9 +45,12 @@ class VALBLK : public BLOCK {
                   {if (To_Nulls) {To_Nulls[n] = (b) ? '*' : 0;}}
   virtual bool   IsNull(int n) {return To_Nulls && To_Nulls[n];}
   virtual void   SetNullable(bool b);
+  virtual bool   IsUnsigned(void) {return Unsigned;}
   virtual void   Init(PGLOBAL g, bool check) = 0;
   virtual int    GetVlen(void) = 0;
   virtual PSZ    GetCharValue(int n);
+  virtual char   GetTinyValue(int n) = 0;
+  virtual uchar  GetUTinyValue(int n) = 0;
   virtual short  GetShortValue(int n) = 0;
   virtual ushort GetUShortValue(int n) = 0;
   virtual int    GetIntValue(int n) = 0;
@@ -55,8 +58,6 @@ class VALBLK : public BLOCK {
   virtual longlong GetBigintValue(int n) = 0;
   virtual ulonglong GetUBigintValue(int n) = 0;
   virtual double GetFloatValue(int n) = 0;
-  virtual char   GetTinyValue(int n) = 0;
-  virtual uchar  GetUTinyValue(int n) = 0;
   virtual void   ReAlloc(void *mp, int n) {Blkp = mp; Nval = n;}
   virtual void   Reset(int n) = 0;
   virtual bool   SetFormat(PGLOBAL g, PSZ fmt, int len, int year = 0);
@@ -123,6 +124,8 @@ class TYPBLK : public VALBLK {
   virtual void   Init(PGLOBAL g, bool check);
   virtual int    GetVlen(void) {return sizeof(TYPE);}
 //virtual PSZ    GetCharValue(int n);
+  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
+  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
   virtual short  GetShortValue(int n) {return (short)Typp[n];}
   virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
   virtual int    GetIntValue(int n) {return (int)Typp[n];}
@@ -130,8 +133,6 @@ class TYPBLK : public VALBLK {
   virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
   virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
   virtual double GetFloatValue(int n) {return (double)Typp[n];}
-  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
-  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
   virtual void   Reset(int n) {Typp[n] = 0;}
 
   // Methods
@@ -168,9 +169,9 @@ class TYPBLK : public VALBLK {
 
  protected:
   // Specialized functions
+  static ulonglong MaxVal(void);
   TYPE GetTypedValue(PVAL vp);
   TYPE GetTypedValue(PVBLK blk, int n);
-  TYPE GetTypedValue(PSZ s);
 
   // Members
   TYPE* const &Typp;
@@ -189,6 +190,8 @@ class CHRBLK : public VALBLK {
   virtual void   Init(PGLOBAL g, bool check);
   virtual int    GetVlen(void) {return Long;}
   virtual PSZ    GetCharValue(int n);
+  virtual char   GetTinyValue(int n);
+  virtual uchar  GetUTinyValue(int n);
   virtual short  GetShortValue(int n);
   virtual ushort GetUShortValue(int n);
   virtual int    GetIntValue(int n);
@@ -196,8 +199,6 @@ class CHRBLK : public VALBLK {
   virtual longlong GetBigintValue(int n);
   virtual ulonglong GetUBigintValue(int n);
   virtual double GetFloatValue(int n);
-  virtual char   GetTinyValue(int n);
-  virtual uchar  GetUTinyValue(int n);
   virtual void   Reset(int n);
   virtual void   SetPrec(int p) {Ci = (p != 0);}
   virtual bool   IsCi(void) {return Ci;}
@@ -242,15 +243,15 @@ class STRBLK : public VALBLK {
   virtual void   Init(PGLOBAL g, bool check);
   virtual int    GetVlen(void) {return sizeof(PSZ);}
   virtual PSZ    GetCharValue(int n) {return Strp[n];}
-  virtual short  GetShortValue(int n) {return (short)atoi(Strp[n]);}
-  virtual ushort GetUShortValue(int n) {return (ushort)atoi(Strp[n]);}
-  virtual int    GetIntValue(int n) {return atol(Strp[n]);}
-  virtual uint   GetUIntValue(int n) {return (unsigned)atol(Strp[n]);}
-  virtual longlong GetBigintValue(int n) {return atoll(Strp[n]);}
-  virtual ulonglong GetUBigintValue(int n) {return (unsigned)atoll(Strp[n]);}
+  virtual char   GetTinyValue(int n);
+  virtual uchar  GetUTinyValue(int n);
+  virtual short  GetShortValue(int n);
+  virtual ushort GetUShortValue(int n);
+  virtual int    GetIntValue(int n);
+  virtual uint   GetUIntValue(int n);
+  virtual longlong GetBigintValue(int n);
+  virtual ulonglong GetUBigintValue(int n);
   virtual double GetFloatValue(int n) {return atof(Strp[n]);}
-  virtual char   GetTinyValue(int n) {return (char)atoi(Strp[n]);}
-  virtual uchar  GetUTinyValue(int n) {return (uchar)atoi(Strp[n]);}
   virtual void   Reset(int n) {Strp[n] = NULL;}
 
   // Methods

storage/connect/value.h

@@ -16,11 +16,6 @@
 #include "assert.h"
 #include "block.h"
 
-#if defined(WIN32)
-#define strtoll _strtoi64
-#define atoll(S) strtoll(S, NULL, 10)
-#endif   // WIN32
-
 /***********************************************************************/
 /*  Types used in some class definitions.                              */
 /***********************************************************************/
@@ -55,6 +50,8 @@ DllExport bool  IsTypeNum(int type);
 DllExport PVAL  AllocateValue(PGLOBAL, PVAL, int = TYPE_VOID, int = 0);
 DllExport PVAL  AllocateValue(PGLOBAL, int, int len = 0, int prec = 0,
                               PSZ fmt = NULL);
+DllExport ulonglong CharToNumber(char *, int, ulonglong, bool, 
+                                 bool *minus = NULL, bool *rc = NULL);
 
 /***********************************************************************/
 /*  Class VALUE represents a constant or variable of any valid type.   */
@@ -96,7 +93,7 @@ class DllExport VALUE : public BLOCK {
 
   // Methods
   virtual bool   SetValue_pval(PVAL valp, bool chktype = false) = 0;
-  virtual void   SetValue_char(char *p, int n) = 0;
+  virtual bool   SetValue_char(char *p, int n) = 0;
   virtual void   SetValue_psz(PSZ s) = 0;
   virtual void   SetValue(char c) {assert(false);}
   virtual void   SetValue(uchar c) {assert(false);}
@@ -112,11 +109,6 @@ class DllExport VALUE : public BLOCK {
   virtual bool   GetBinValue(void *buf, int buflen, bool go) = 0;
   virtual char  *ShowValue(char *buf, int len = 0) = 0;
   virtual char  *GetCharString(char *p) = 0;
-//virtual char  *GetShortString(char *p, int n) {return "#####";}
-//virtual char  *GetIntString(char *p, int n) = 0;
-//virtual char  *GetBigintString(char *p, int n) = 0;
-//virtual char  *GetFloatString(char *p, int n, int prec) = 0;
-//virtual char  *GetTinyString(char *p, int n) {return "?";}
   virtual bool   IsEqual(PVAL vp, bool chktype) = 0;
   virtual bool   FormatValue(PVAL vp, char *fmt) = 0;
 
@@ -169,7 +161,7 @@ class DllExport TYPVAL : public VALUE {
 
   // Methods
   virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual void   SetValue_char(char *p, int n);
+  virtual bool   SetValue_char(char *p, int n);
   virtual void   SetValue_psz(PSZ s);
   virtual void   SetValue(char c) {Tval = (TYPE)c; Null = false;}
   virtual void   SetValue(uchar c) {Tval = (TYPE)c; Null = false;}
@@ -185,11 +177,6 @@ class DllExport TYPVAL : public VALUE {
   virtual bool   GetBinValue(void *buf, int buflen, bool go);
   virtual char  *ShowValue(char *buf, int);
   virtual char  *GetCharString(char *p);
-//virtual char  *GetShortString(char *p, int n);
-//virtual char  *GetIntString(char *p, int n);
-//virtual char  *GetBigintString(char *p, int n);
-//virtual char  *GetFloatString(char *p, int n, int prec = -1);
-//virtual char  *GetTinyString(char *p, int n);
   virtual bool   IsEqual(PVAL vp, bool chktype);
   virtual bool   SetConstFormat(PGLOBAL, FORMAT&);
   virtual bool   FormatValue(PVAL vp, char *fmt);
@@ -201,9 +188,10 @@ class DllExport TYPVAL : public VALUE {
   TYPVAL(void) : VALUE(TYPE_ERROR) {}
 
   // Specialized functions
+  static  ulonglong MaxVal(void);
           TYPE   GetTypedValue(PVAL vp);
           TYPE   GetTypedValue(PVBLK blk, int n);
-  TYPE GetTypedValue(PSZ s);
+//        TYPE   GetTypedValue(PSZ s);
 
   // Members
   TYPE        Tval;
@@ -227,21 +215,21 @@ class DllExport TYPVAL<PSZ>: public VALUE {
   virtual int    GetValPrec() {return (Ci) ? 1 : 0;}
   virtual int    GetSize(void) {return (Strp) ? strlen(Strp) : 0;}
   virtual PSZ    GetCharValue(void) {return Strp;}
-  virtual char   GetTinyValue(void) {return (char)atoi(Strp);}
-  virtual uchar  GetUTinyValue(void) {return (uchar)atoi(Strp);}
-  virtual short  GetShortValue(void) {return (short)atoi(Strp);}
-  virtual ushort GetUShortValue(void) {return (ushort)atoi(Strp);}
-  virtual int    GetIntValue(void) {return atol(Strp);}
-  virtual uint   GetUIntValue(void) {return (uint)atol(Strp);}
-  virtual longlong GetBigintValue(void) {return atoll(Strp);}
-  virtual ulonglong GetUBigintValue(void) {return (ulonglong)atoll(Strp);}
+  virtual char   GetTinyValue(void);
+  virtual uchar  GetUTinyValue(void);
+  virtual short  GetShortValue(void);
+  virtual ushort GetUShortValue(void);
+  virtual int    GetIntValue(void);
+  virtual uint   GetUIntValue(void);
+  virtual longlong GetBigintValue(void);
+  virtual ulonglong GetUBigintValue(void);
   virtual double GetFloatValue(void) {return atof(Strp);}
   virtual void  *GetTo_Val(void) {return Strp;}
   virtual void   SetPrec(int prec) {Ci = prec != 0;}
 
   // Methods
   virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual void   SetValue_char(char *p, int n);
+  virtual bool   SetValue_char(char *p, int n);
   virtual void   SetValue_psz(PSZ s);
   virtual void   SetValue_pvblk(PVBLK blk, int n);
   virtual void   SetValue(char c);
@@ -257,23 +245,10 @@ class DllExport TYPVAL<PSZ>: public VALUE {
   virtual bool   GetBinValue(void *buf, int buflen, bool go);
   virtual char  *ShowValue(char *buf, int);
   virtual char  *GetCharString(char *p);
-//virtual char  *GetShortString(char *p, int n);
-//virtual char  *GetIntString(char *p, int n);
-//virtual char  *GetBigintString(char *p, int n);
-//virtual char  *GetFloatString(char *p, int n, int prec = -1);
-//virtual char  *GetTinyString(char *p, int n);
   virtual bool   IsEqual(PVAL vp, bool chktype);
   virtual bool   FormatValue(PVAL vp, char *fmt);
   virtual bool   SetConstFormat(PGLOBAL, FORMAT&);
 
-  // Specialized functions
-//template <class T>
-//T      GetValue_as(T type) {return Strp;}
-//int    GetValue_as(int type) {return atol(Strp);}
-//short  GetValue_as(short type) {return (short)atoi(Strp);}
-//longlong GetValue_as(longlong type) {return atoll(Strp);}
-//double GetValue_as(double type) {return atof(Strp);}
-
   // Members
   PSZ         Strp;
   bool        Ci;                   // true if case insensitive
@@ -295,7 +270,7 @@ class DllExport DTVAL : public TYPVAL<int> {
 
   // Implementation
   virtual bool   SetValue_pval(PVAL valp, bool chktype);
-  virtual void   SetValue_char(char *p, int n);
+  virtual bool   SetValue_char(char *p, int n);
   virtual void   SetValue_psz(PSZ s);
   virtual void   SetValue_pvblk(PVBLK blk, int n);
   virtual char  *GetCharString(char *p);
@@ -304,15 +279,15 @@ class DllExport DTVAL : public TYPVAL<int> {
           bool   SetFormat(PGLOBAL g, PSZ fmt, int len, int year = 0);
           bool   SetFormat(PGLOBAL g, PVAL valp);
           bool   IsFormatted(void) {return Pdtp != NULL;}
-          bool   GetTmMember(OPVAL op, int& mval);
-          bool   DateDiff(DTVAL *dtp, OPVAL op, int& tdif);
+//        bool   GetTmMember(OPVAL op, int& mval);
+//        bool   DateDiff(DTVAL *dtp, OPVAL op, int& tdif);
           bool   MakeTime(struct tm *ptm);
   static  void   SetTimeShift(void);
   static  int    GetShift(void) {return Shift;}
 
   // Methods
           bool   MakeDate(PGLOBAL g, int *val, int nval);
-          bool   WeekNum(PGLOBAL g, int& nval);
+//        bool   WeekNum(PGLOBAL g, int& nval);
 
   struct  tm    *GetGmTime(struct tm *);
 

storage/connect/xobject.cpp

@@ -134,6 +134,7 @@ bool CONSTANT::Compare(PXOB xp)
 
   } // end of Compare
 
+#if 0
 /***********************************************************************/
 /*  Rephrase: temporary implementation used by PlugRephraseSQL.        */
 /***********************************************************************/
@@ -166,6 +167,7 @@ bool CONSTANT::Rephrase(PGLOBAL g, PSZ work)
 
   return false;
   } // end of Rephrase
+#endif // 0
 
 /***********************************************************************/
 /*  Make file output of a constant object.                             */