- XML and INI tables now return NULL when a node does not exist in a row (XML)

  or if the key is missing in a section (INI)

modified:
  mysql-test/suite/connect/r/ini.result
  mysql-test/suite/connect/r/xml.result
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp

- Do a sub-storage cleanup on info commands and fix a limit of column number
  in ODBCColumns. This was doing a crash for unexpected longjmp when many info
  commands were executed in a row.

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp

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

@@ -24,21 +24,21 @@ tel CHAR(16)
 ) ENGINE=CONNECT TABLE_TYPE=INI FILE_NAME='contact.ini';
 SELECT contact, name, hired, city, tel FROM t1;
 contact	name	hired	city	tel
-BER	Bertrand	1970-01-01	Issy-les-Mlx	09.54.36.29.60
+BER	Bertrand	NULL	Issy-les-Mlx	09.54.36.29.60
 WEL	Schmitt	1985-02-19	Berlin	03.43.377.360
-UK1	Smith	2003-11-08	London	
+UK1	Smith	2003-11-08	London	NULL
 UPDATE t1 SET forename= 'Harry' where contact='UK1';
 SELECT * FROM t1 WHERE contact='UK1';
 contact	name	forename	hired	address	city	zipcode	tel
-UK1	Smith	Harry	2003-11-08	143 Blum Rd.	London	NW1 2BP	
+UK1	Smith	Harry	2003-11-08	143 Blum Rd.	London	NW1 2BP	NULL
 INSERT INTO t1 (contact,forename) VALUES ('UK1','Harrison');
 SELECT * FROM t1 WHERE contact='UK1';
 contact	name	forename	hired	address	city	zipcode	tel
-UK1	Smith	Harrison	2003-11-08	143 Blum Rd.	London	NW1 2BP	
+UK1	Smith	Harrison	2003-11-08	143 Blum Rd.	London	NW1 2BP	NULL
 INSERT INTO t1 (contact,forename) VALUES ('UK2','John');
 SELECT * FROM t1 WHERE contact='UK2';
 contact	name	forename	hired	address	city	zipcode	tel
-UK2		John	1970-01-01				
+UK2	NULL	John	NULL	NULL	NULL	NULL	NULL
 DROP TABLE t1;
 SELECT REPLACE(REPLACE(LOAD_FILE('DATADIR/test/contact.ini'),'\r\n','\n'),'\n\n','\n');;
 REPLACE(REPLACE(LOAD_FILE('DATADIR/test/contact.ini'),'\r\n','\n'),'\n\n','\n')

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

@@ -16,7 +16,7 @@ DATEPUB INT(4)
 SELECT * FROM t1;
 AUTHOR	Jean-Christophe Bernadac
 TITLE	Construire une application XML
-TRANSLATOR	
+TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1999
 AUTHOR	William J. Pardi
@@ -38,12 +38,12 @@ DATEPUB INT(4)
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample.xml'
   OPTION_LIST='xmlsup=libxml2';
 SELECT * FROM t1;
-author	
+author	NULL
 TITLE	Construire une application XML
-TRANSLATOR	
+TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1999
-author	
+author	NULL
 TITLE	XML en Action
 TRANSLATOR	James Guerin
 PUBLISHER	Microsoft Press Paris
@@ -76,10 +76,10 @@ SUBJECT CHAR(32)
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample.xml'
   OPTION_LIST='Coltype=@,xmlsup=libxml2';
 SELECT * FROM t1;
-isbn	
+isbn	NULL
 LANG	fr
 SUBJECT	applications
-isbn	
+isbn	NULL
 LANG	fr
 SUBJECT	applications
 DROP TABLE t1;
@@ -104,7 +104,7 @@ LANG	fr
 SUBJECT	applications
 AUTHOR	Jean-Christophe Bernadac
 TITLE	Construire une application XML
-TRANSLATOR	
+TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1999
 ISBN	9782840825685
@@ -140,7 +140,7 @@ LANG	fr
 SUBJECT	applications
 AUTHOR	Jean-Christophe Bernadac
 TITLE	Construire une application XML
-TRANSLATOR	
+TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1999
 ISBN	9782840825685
@@ -156,7 +156,7 @@ LANG	fr
 SUBJECT	général
 AUTHOR	Alain Michard
 TITLE	XML, Langage et Applications
-TRANSLATOR	
+TRANSLATOR	NULL
 PUBLISHER	Eyrolles Paris
 DATEPUB	1998
 SELECT LOAD_FILE('test/xsample2.xml');
@@ -228,9 +228,9 @@ subject	applications
 authorfn	Jean-Christophe
 authorln	Bernadac
 title	Construire une application XML
-translated	
-tranfn	
-tranln	
+translated	NULL
+tranfn	NULL
+tranln	NULL
 publisher	Eyrolles
 location	Paris
 year	1999
@@ -264,8 +264,8 @@ isbn       CHAR(15) FIELD_FORMAT='@isbn'
 ) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xsample.xml'
   TABNAME='BIBLIO' OPTION_LIST='rownode=BOOK,skipnull=1,xmlsup=libxml2';
 SELECT * FROM t1;
-isbn	
-isbn	
+isbn	NULL
+isbn	NULL
 DROP TABLE t1;
 #
 # Testing character sets

storage/connect/ha_connect.cc

@@ -2761,10 +2761,10 @@ int ha_connect::info(uint flag)
 
   if (!valid_info) {
     // tdbp must be available to get updated info
-    if (!tdbp || xp->CheckQuery(valid_query_id)) {
+    if (xp->CheckQuery(valid_query_id) || !tdbp) {
       if (xmod == MODE_ANY) {               // Pure info, not a query
         pure= true;
-//      xmod= MODE_READ;
+        xp->CheckCleanup();
         } // endif xmod
 
 //    tdbp= OpenTable(g, xmod == MODE_DELETE);

storage/connect/odbconn.cpp

@@ -258,8 +258,9 @@ PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *table,
     if (ocp->Open(dsn, 2) < 1)        // 2 is openReadOnly
       return NULL;
 
+    // We fix a MySQL limit because some data sources return 32767
     n = ocp->GetMaxValue(SQL_MAX_COLUMNS_IN_TABLE);
-    maxres = (n) ? (int)n : 250;
+    maxres = (n) ? min(n, 4096) : 4096;
     n = ocp->GetMaxValue(SQL_MAX_QUALIFIER_NAME_LEN);
     length[0] = (n) ? (n + 1) : 128;
     n = ocp->GetMaxValue(SQL_MAX_USER_NAME_LEN);

storage/connect/tabsys.cpp

@@ -507,12 +507,20 @@ void INICOL::ReadColumn(PGLOBAL g)
       Valbuf[Long] = '\0';
       break;
     default:
-      GetPrivateProfileString(tdbp->Section, Name, "",
+      GetPrivateProfileString(tdbp->Section, Name, "",
                                         Valbuf, Long + 1, tdbp->Ifile);
       break;
     } // endswitch Flag
 
-  Value->SetValue_psz(Valbuf);
+  // Missing keys are interpreted as null values
+  if (!strcmp(Valbuf, "")) {
+    if (Nullable)
+      Value->SetNull(true);
+
+    Value->Reset();              // Null value
+  } else
+    Value->SetValue_psz(Valbuf);
+
   } // end of ReadColumn
 
 /***********************************************************************/

storage/connect/tabxml.cpp

@@ -1222,10 +1222,14 @@ void XMLCOL::ReadColumn(PGLOBAL g)
         longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
       } // endswitch
 
-  } else
-    *Valbuf = '\0';
+    Value->SetValue_psz(Valbuf);
+  } else {
+    if (Nullable)
+      Value->SetNull(true);
+
+    Value->Reset();              // Null value
+  } // endif ValNode
 
-  Value->SetValue_psz(Valbuf);
   Nx = Tdbp->Irow;
   } // end of ReadColumn
 
@@ -1400,45 +1404,50 @@ void XMULCOL::ReadColumn(PGLOBAL g)
   else if (Sx == Tdbp->Nsub)
     return;                                 // Same row
 
-  n = Nl->GetLength();
-  *(p = Valbuf) = '\0';
-  len = Long;
-
-  for (i = Tdbp->Nsub; i < n; i++) {
-    ValNode = Nl->GetItem(g, i, Vxnp);
+  if ((n = Nl->GetLength())) {
+    *(p = Valbuf) = '\0';
+    len = Long;
 
-    if (ValNode->GetType() != XML_ELEMENT_NODE &&
-        ValNode->GetType() != XML_ATTRIBUTE_NODE) {
-      sprintf(g->Message, MSG(BAD_VALNODE), ValNode->GetType(), Name);
-      longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
-      } // endif type
+    for (i = Tdbp->Nsub; i < n; i++) {
+      ValNode = Nl->GetItem(g, i, Vxnp);
 
-    // Get the Xname value from the XML file
-    switch (ValNode->GetContent(g, p, len + 1)) {
-      case RC_OK:
-        break;
-      case RC_INFO:
-        PushWarning(g, Tdbp);
-        break;
-      default:
+      if (ValNode->GetType() != XML_ELEMENT_NODE &&
+          ValNode->GetType() != XML_ATTRIBUTE_NODE) {
+        sprintf(g->Message, MSG(BAD_VALNODE), ValNode->GetType(), Name);
         longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
-      } // endswitch
+        } // endif type
 
-    if (!Tdbp->Xpand) {
-      // Concatenate all values
-      if (n - i > 1)
-        strncat(Valbuf, ", ", Long + 1);
+      // Get the Xname value from the XML file
+      switch (ValNode->GetContent(g, p, len + 1)) {
+        case RC_OK:
+          break;
+        case RC_INFO:
+          PushWarning(g, Tdbp);
+          break;
+        default:
+          longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
+        } // endswitch
 
-      len -= strlen(p);
-      p += strlen(p);
-    } else
-      break;
+      if (!Tdbp->Xpand) {
+        // Concatenate all values
+        if (n - i > 1)
+          strncat(Valbuf, ", ", Long + 1);
 
-    } // endfor i
+        len -= strlen(p);
+        p += strlen(p);
+      } else
+        break;
+
+      } // endfor i
+
+    Value->SetValue_psz(Valbuf);
+  } else {
+    if (Nullable)
+      Value->SetNull(true);
 
-//  } // endif Nx
+    Value->Reset();              // Null value
+  } // endif ValNode
 
-  Value->SetValue_psz(Valbuf);
   Nx = Tdbp->Irow;
   Sx = Tdbp->Nsub;
   Tdbp->NextSame = (Tdbp->Xpand && Nl->GetLength() - Sx > 1);
@@ -1640,9 +1649,7 @@ void XPOSCOL::ReadColumn(PGLOBAL g)
     longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
     } // endif Clist
 
-  *Valbuf = '\0';
-
-  if ((ValNode = Tdbp->Clist->GetItem(g, Rank, Vxnp)))
+  if ((ValNode = Tdbp->Clist->GetItem(g, Rank, Vxnp))) {
     // Get the column value from the XML file
     switch (ValNode->GetContent(g, Valbuf, Long + 1)) {
       case RC_OK:
@@ -1654,7 +1661,14 @@ void XPOSCOL::ReadColumn(PGLOBAL g)
         longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
       } // endswitch
 
-  Value->SetValue_psz(Valbuf);
+    Value->SetValue_psz(Valbuf);
+  } else {
+    if (Nullable)
+      Value->SetNull(true);
+
+    Value->Reset();              // Null value
+  } // endif ValNode
+
   Nx = Tdbp->Irow;
   } // end of ReadColumn