Merge branch 'connect/10.0' into 10.0

77b54848 · Sergei Golubchik · b6bcd0fc · 31d2c024 · 77b54848 · 77b54848
Commit 77b54848 authored Feb 16, 2016 by Sergei Golubchik
27 changed files
--- a/storage/connect/fmdlex.c
+++ b/storage/connect/fmdlex.c
+#include <setjmp.h>
 #define yyFlexLexer fmdfFlexLexer
 #define yy_create_buffer fmdf_create_buffer
 #define yy_delete_buffer fmdf_delete_buffer
@@ -506,13 +508,16 @@ YY_MALLOC_DECL
 #define YY_BREAK break;
 #endif
+static jmp_buf env;
 YY_DECL
  {
  register yy_state_type yy_current_state;
  register char *yy_cp, *yy_bp;
  register int yy_act;
+	if (setjmp(env))
+		return -1;
  /*************************************************************************/
  /* Flex parser to analyze date format and produce input and/or output    */
@@ -1316,7 +1321,7 @@ char msg[];
 #endif
  {
  (void) fprintf( stderr, "%s\n", msg );
-  exit( 1 );
+  longjmp(env, 1 );
  }

--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
-/* Copyright (C) Olivier Bertrand 2004 - 2015
+/* Copyright (C) Olivier Bertrand 2004 - 2016
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -169,7 +169,7 @@
 #define JSONMAX      10             // JSON Default max grp size
 extern "C" {
-       char version[]= "Version 1.04.0005 December 11, 2015";
+       char version[]= "Version 1.04.0005 January 24, 2016";
 #if defined(__WIN__)
       char compver[]= "Version 1.04.0005 " __DATE__ " "  __TIME__;
       char slash= '\\';
@@ -339,15 +339,22 @@ static MYSQL_THDVAR_ENUM(
  &language_typelib);              // typelib
 #endif   // XMSG || NEWMSG
+/***********************************************************************/
+/*  The CONNECT handlerton object.                                     */
+/***********************************************************************/
+handlerton *connect_hton= NULL;
 /***********************************************************************/
 /*  Function to export session variable values to other source files.  */
 /***********************************************************************/
-extern "C" int GetTraceValue(void) {return THDVAR(current_thd, xtrace);}
+extern "C" int GetTraceValue(void) 
+  {return connect_hton ? THDVAR(current_thd, xtrace) : 0;}
 bool ExactInfo(void) {return THDVAR(current_thd, exact_info);}
 USETEMP UseTemp(void) {return (USETEMP)THDVAR(current_thd, use_tempfile);}
 int GetConvSize(void) {return THDVAR(current_thd, conv_size);}
 TYPCONV GetTypeConv(void) {return (TYPCONV)THDVAR(current_thd, type_conv);}
-uint GetJsonGrpSize(void) {return THDVAR(current_thd, json_grp_size);}
+uint GetJsonGrpSize(void)
+  {return connect_hton ? THDVAR(current_thd, json_grp_size) : 10;}
 uint GetWorkSize(void) {return THDVAR(current_thd, work_size);}
 void SetWorkSize(uint) 
 {
@@ -442,11 +449,6 @@ static int check_msg_path (MYSQL_THD thd, struct st_mysql_sys_var *var,
 } // end of check_msg_path
 #endif   // 0
-/***********************************************************************/
-/*  The CONNECT handlerton object.                                     */
-/***********************************************************************/
-handlerton *connect_hton;
 /**
  CREATE TABLE option list (table options)
@@ -687,6 +689,7 @@ static int connect_done_func(void *)
    delete pc;
    } // endfor pc
+	connect_hton= NULL;
  DBUG_RETURN(error);
 } // end of connect_done_func
@@ -4923,11 +4926,11 @@ static bool add_field(String *sql, const char *field_name, int typ, int len,
  error|= sql->append("` ");
  error|= sql->append(type);
-  if (len && typ != TYPE_DATE) {
+	if (len && typ != TYPE_DATE && (typ != TYPE_DOUBLE || dec >= 0)) {
    error|= sql->append('(');
    error|= sql->append_ulonglong(len);
-    if (!strcmp(type, "DOUBLE")) {
+		if (typ == TYPE_DOUBLE) {
      error|= sql->append(',');
      // dec must be < len and < 31
      error|= sql->append_ulonglong(MY_MIN(dec, (MY_MIN(len, 31) - 1)));
@@ -5513,6 +5516,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
        dec= crp->Prec;
        flg= crp->Flag;
        v= crp->Var;
+				tm= (crp->Kdata->IsNullable()) ? 0 : NOT_NULL_FLAG;
        if (!len && typ == TYPE_STRING)
          len= 256;      // STRBLK's have 0 length
@@ -5520,9 +5524,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
        // Now add the field
 #if defined(NEW_WAY)
        rc= add_fields(g, thd, &alter_info, cnm, typ, len, dec,
-                       NOT_NULL_FLAG, "", flg, dbf, v);
+                       tm, "", flg, dbf, v);
 #else   // !NEW_WAY
-        if (add_field(&sql, cnm, typ, len, dec, NULL, NOT_NULL_FLAG,
+        if (add_field(&sql, cnm, typ, len, dec, NULL, tm,
                      NULL, NULL, NULL, NULL, flg, dbf, v))
          rc= HA_ERR_OUT_OF_MEM;
 #endif  // !NEW_WAY
@@ -5579,7 +5583,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
              len= crp->Kdata->GetIntValue(i);
              break;
            case FLD_SCALE:
-              dec= crp->Kdata->GetIntValue(i);
+							dec = (!crp->Kdata->IsNull(i)) ? crp->Kdata->GetIntValue(i) : -1;
              break;
            case FLD_NULL:
              if (crp->Kdata->GetIntValue(i))
@@ -5672,14 +5676,14 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
              dec= 0;
            } // endswitch typ
-          } // endif ttp
+        } else
 #endif   // ODBC_SUPPORT
        // Make the arguments as required by add_fields
-        if (typ == TYPE_DATE)
+				if (typ == TYPE_DOUBLE)
+					prec= len;
+				if (typ == TYPE_DATE)
          prec= 0;
-        else if (typ == TYPE_DOUBLE)
-          prec= len;
        // Now add the field
 #if defined(NEW_WAY)

--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -594,8 +594,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty)
  if (fs) {
 		fputs(EL, fs);
    fclose(fs);
-		str = (err) ? NULL : (char*) "Ok";
+		str = (err) ? NULL : strcpy(g->Message, "Ok");
-  } else if (!err) {
+	} else if (!err) {
    str = ((JOUTSTR*)jp)->Strp;
    jp->WriteChr('\0');
    PlugSubAlloc(g, NULL, ((JOUTSTR*)jp)->N);

--- a/storage/connect/jsonudf.cpp
+++ b/storage/connect/jsonudf.cpp
@@ -31,6 +31,8 @@ uint GetJsonGrpSize(void);
 static int IsJson(UDF_ARGS *args, uint i);
 static PSZ MakePSZ(PGLOBAL g, UDF_ARGS *args, int i);
+static uint JsonGrpSize = 10;
 /* ----------------------------------- JSNX ------------------------------------ */
 /*********************************************************************************/
@@ -1039,6 +1041,14 @@ static void SetChanged(PBSON bsp)
 	bsp->Changed = true;
 } /* end of SetChanged */
+/*********************************************************************************/
+/*  Replaces GetJsonGrpSize not usable when CONNECT is not installed.            */
+/*********************************************************************************/
+static uint GetJsonGroupSize(void)
+{
+	return (JsonGrpSize) ? JsonGrpSize : GetJsonGrpSize();
+} // end of GetJsonGroupSize
 /*********************************************************************************/
 /*  Program for SubSet re-initialization of the memory pool.                     */
 /*********************************************************************************/
@@ -2393,12 +2403,51 @@ void json_object_list_deinit(UDF_INIT* initid)
 	JsonFreeMem((PGLOBAL)initid->ptr);
 } // end of json_object_list_deinit
+/*********************************************************************************/
+/*  Set the value of JsonGrpSize.                                                */
+/*********************************************************************************/
+my_bool jsonset_grp_size_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
+{
+	if (args->arg_count != 1 || args->arg_type[0] != INT_RESULT) {
+		strcpy(message, "This function must have 1 integer argument");
+		return true;
+	} else
+		return false;
+} // end of jsonset_grp_size_init
+long long jsonset_grp_size(UDF_INIT *initid, UDF_ARGS *args, char *, char *)
+{
+	long long n = *(long long*)args->args[0];
+	JsonGrpSize = (uint)n;
+	return (long long)GetJsonGroupSize();
+} // end of jsonset_grp_size
+/*********************************************************************************/
+/*  Get the value of JsonGrpSize.                                                */
+/*********************************************************************************/
+my_bool jsonget_grp_size_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
+{
+	if (args->arg_count != 0) {
+		strcpy(message, "This function must have no arguments");
+		return true;
+	} else
+		return false;
+} // end of jsonget_grp_size_init
+long long jsonget_grp_size(UDF_INIT *initid, UDF_ARGS *args, char *, char *)
+{
+	return (long long)GetJsonGroupSize();
+} // end of jsonget_grp_size
 /*********************************************************************************/
 /*  Make a Json array from values coming from rows.                              */
 /*********************************************************************************/
 my_bool json_array_grp_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
 {
-  unsigned long reslen, memlen, n = GetJsonGrpSize();
+  unsigned long reslen, memlen, n = GetJsonGroupSize();
  if (args->arg_count != 1) {
    strcpy(message, "This function can only accept 1 argument");
@@ -2458,7 +2507,7 @@ void json_array_grp_clear(UDF_INIT *initid, char*, char*)
  PlugSubSet(g, g->Sarea, g->Sarea_Size);
  g->Activityp = (PACTIVITY)new(g) JARRAY;
-  g->N = GetJsonGrpSize();
+  g->N = GetJsonGroupSize();
 } // end of json_array_grp_clear
 void json_array_grp_deinit(UDF_INIT* initid)
@@ -2471,7 +2520,7 @@ void json_array_grp_deinit(UDF_INIT* initid)
 /*********************************************************************************/
 my_bool json_object_grp_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
 {
-  unsigned long reslen, memlen, n = GetJsonGrpSize();
+  unsigned long reslen, memlen, n = GetJsonGroupSize();
 	if (args->arg_count != 2) {
    strcpy(message, "This function requires 2 arguments (key, value)");
@@ -2529,7 +2578,7 @@ void json_object_grp_clear(UDF_INIT *initid, char*, char*)
  PlugSubSet(g, g->Sarea, g->Sarea_Size);
  g->Activityp = (PACTIVITY)new(g) JOBJECT;
-  g->N = GetJsonGrpSize();
+  g->N = GetJsonGroupSize();
 } // end of json_object_grp_clear
 void json_object_grp_deinit(UDF_INIT* initid)

--- a/storage/connect/jsonudf.h
+++ b/storage/connect/jsonudf.h
@@ -77,6 +77,12 @@ extern "C" {
 	DllExport char *json_object_list(UDF_EXEC_ARGS);
 	DllExport void json_object_list_deinit(UDF_INIT*);
+	DllExport my_bool jsonset_grp_size_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport long long jsonset_grp_size(UDF_INIT*, UDF_ARGS*, char*, char*);
+	DllExport my_bool jsonget_grp_size_init(UDF_INIT*, UDF_ARGS*, char*);
+	DllExport long long jsonget_grp_size(UDF_INIT*, UDF_ARGS*, char*, char*);
 	DllExport my_bool json_array_grp_init(UDF_INIT*, UDF_ARGS*, char*);
 	DllExport void json_array_grp_add(UDF_INIT *, UDF_ARGS *, char *, char *);
 	DllExport char *json_array_grp(UDF_EXEC_ARGS);

--- a/storage/connect/mycat.cc
+++ b/storage/connect/mycat.cc
-/* Copyright (C) Olivier Bertrand 2004 - 2015
+/* Copyright (C) Olivier Bertrand 2004 - 2016
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 /* -------------                                                       */
 /*  Version 1.4                                                        */
 /*                                                                     */
-/*  Author: Olivier Bertrand                       2012 - 2015         */
+/*  Author: Olivier Bertrand                       2012 - 2016         */
 /*                                                                     */
 /* WHAT THIS PROGRAM DOES:                                             */
 /* -----------------------                                             */
@@ -509,30 +509,33 @@ void MYCAT::SetPath(PGLOBAL g, LPCSTR *datapath, const char *path)
 /*  GetTableDesc: retrieve a table descriptor.                         */
 /*  Look for a table descriptor matching the name and type.            */
 /***********************************************************************/
-PRELDEF MYCAT::GetTableDesc(PGLOBAL g, LPCSTR name,
+PRELDEF MYCAT::GetTableDesc(PGLOBAL g, PTABLE tablep,
                                       LPCSTR type, PRELDEF *)
  {
 	if (trace)
-		printf("GetTableDesc: name=%s am=%s\n", name, SVP(type));
+		printf("GetTableDesc: name=%s am=%s\n", tablep->GetName(), SVP(type));
 	// If not specified get the type of this table
  if (!type)
    type= Hc->GetStringOption("Type","*");
-  return MakeTableDesc(g, name, type);
+  return MakeTableDesc(g, tablep, type);
  } // end of GetTableDesc
 /***********************************************************************/
 /*  MakeTableDesc: make a table/view description.                      */
 /*  Note: caller must check if name already exists before calling it.  */
 /***********************************************************************/
-PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am)
+PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am)
  {
  TABTYPE tc;
+	LPCSTR  name = (PSZ)PlugDup(g, tablep->GetName());
+	LPCSTR  schema = (PSZ)PlugDup(g, tablep->GetSchema());
  PRELDEF tdp= NULL;
 	if (trace)
-		printf("MakeTableDesc: name=%s am=%s\n", name, SVP(am));
+		printf("MakeTableDesc: name=%s schema=%s am=%s\n",
+		                       name, SVP(schema), SVP(am));
  /*********************************************************************/
  /*  Get a unique enum identifier for types.                          */
@@ -571,11 +574,11 @@ PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am)
    case TAB_VIR: tdp= new(g) VIRDEF;   break;
    case TAB_JSON: tdp= new(g) JSONDEF; break;
    default:
-      sprintf(g->Message, MSG(BAD_TABLE_TYPE), am, name);
+			sprintf(g->Message, MSG(BAD_TABLE_TYPE), am, name);
    } // endswitch
  // Do make the table/view definition
-  if (tdp && tdp->Define(g, this, name, am))
+  if (tdp && tdp->Define(g, this, name, schema, am))
    tdp= NULL;
  return tdp;
@@ -588,20 +591,20 @@ PTDB MYCAT::GetTable(PGLOBAL g, PTABLE tablep, MODE mode, LPCSTR type)
  {
  PRELDEF tdp;
  PTDB    tdbp= NULL;
-  LPCSTR  name= tablep->GetName();
+//  LPCSTR  name= tablep->GetName();
 	if (trace)
-		printf("GetTableDB: name=%s\n", name);
+		printf("GetTableDB: name=%s\n", tablep->GetName());
  // Look for the description of the requested table
-  tdp= GetTableDesc(g, name, type);
+  tdp= GetTableDesc(g, tablep, type);
  if (tdp) {
 		if (trace)
 			printf("tdb=%p type=%s\n", tdp, tdp->GetType());
-		if (tablep->GetQualifier())
+		if (tablep->GetSchema())
-			tdp->Database = SetPath(g, tablep->GetQualifier());
+			tdp->Database = SetPath(g, tablep->GetSchema());
    tdbp= tdp->GetTable(g, mode);
 		} // endif tdp

--- a/storage/connect/mycat.h
+++ b/storage/connect/mycat.h
@@ -100,15 +100,17 @@ class MYCAT : public CATALOG {
 //void    SetDataPath(PGLOBAL g, const char *path) 
 //            {SetPath(g, &DataPath, path);}
  bool    StoreIndex(PGLOBAL, PTABDEF) {return false;}  // Temporary
-  PRELDEF GetTableDesc(PGLOBAL g, LPCSTR name,
+//  PRELDEF GetTableDesc(PGLOBAL g, LPCSTR name,
-                                  LPCSTR type, PRELDEF *prp = NULL);
+	PRELDEF GetTableDesc(PGLOBAL g, PTABLE tablep,
+		                   LPCSTR type, PRELDEF *prp = NULL);
  PTDB    GetTable(PGLOBAL g, PTABLE tablep, 
                              MODE mode = MODE_READ, LPCSTR type = NULL);
  void    ClearDB(PGLOBAL g);
 protected:
-  PRELDEF MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am);
+//  PRELDEF MakeTableDesc(PGLOBAL g, LPCSTR name, LPCSTR am);
-//void    SetPath(PGLOBAL g, LPCSTR *datapath, const char *path);
+	PRELDEF MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am);
+	//void    SetPath(PGLOBAL g, LPCSTR *datapath, const char *path);
  // Members
  ha_connect *Hc;                          // The Connect handler

--- a/storage/connect/mysql-test/connect/r/json_udf.result
+++ b/storage/connect/mysql-test/connect/r/json_udf.result
@@ -217,7 +217,9 @@ DEPARTMENT	Json_Array_Grp(NAME)
 2452	["BIGHEAD","ORELLY","BIGHORN","SMITH","CHERRY"]
 Warnings:
 Warning	1105	Result truncated to json_grp_size values
-SET connect_json_grp_size=30;
+SELECT JsonSet_Grp_Size(30);
+JsonSet_Grp_Size(30)
+30
 SELECT Json_Object(title, Json_Array_Grp(name) `json_names`) from t3 GROUP BY title;
 Json_Object(title, Json_Array_Grp(name) `json_names`)
 {"title":"ADMINISTRATOR","names":["GOOSEPEN","FUNNIGUY","SHRINKY"]}

--- a/storage/connect/mysql-test/connect/r/odbc.result
+++ b/storage/connect/mysql-test/connect/r/odbc.result
@@ -5,7 +5,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Name` varchar(256) NOT NULL,
-  `Description` varchar(256) NOT NULL
+  `Description` varchar(256) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
 DROP TABLE t1;
 CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Drivers;
@@ -13,35 +13,35 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Description` char(128) NOT NULL,
-  `Attributes` varchar(256) NOT NULL
+  `Attributes` varchar(256) DEFAULT 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_Cat` char(128) NOT NULL,
+  `Table_Cat` char(128) DEFAULT NULL,
-  `Table_Schema` char(128) NOT NULL,
+  `Table_Schema` char(128) DEFAULT NULL,
  `Table_Name` char(128) NOT NULL,
  `Table_Type` char(16) NOT NULL,
-  `Remark` char(255) NOT NULL
+  `Remark` char(255) DEFAULT 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_Cat` char(128) NOT NULL,
+  `Table_Cat` char(128) DEFAULT NULL,
-  `Table_Schema` char(128) NOT NULL,
+  `Table_Schema` char(128) DEFAULT NULL,
  `Table_Name` char(128) NOT NULL,
  `Column_Name` char(128) NOT NULL,
  `Data_Type` smallint(6) NOT NULL,
  `Type_Name` char(30) NOT NULL,
  `Column_Size` int(10) NOT NULL,
  `Buffer_Length` int(10) NOT NULL,
-  `Decimal_Digits` smallint(6) NOT NULL,
+  `Decimal_Digits` smallint(6) DEFAULT NULL,
-  `Radix` smallint(6) NOT NULL,
+  `Radix` smallint(6) DEFAULT NULL,
  `Nullable` smallint(6) NOT NULL,
-  `Remarks` char(255) NOT NULL
+  `Remarks` char(255) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='Not important' `TABLE_TYPE`='ODBC' `CATFUNC`='Columns'
 DROP TABLE t1;
--- a/storage/connect/mysql-test/connect/r/odbc_oracle.result
+++ b/storage/connect/mysql-test/connect/r/odbc_oracle.result
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Name` varchar(256) NOT NULL,
-  `Description` varchar(256) NOT NULL
+  `Description` varchar(256) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
 SET NAMES utf8;
 #
@@ -14,9 +14,9 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables;
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
-	MTR	T2	TABLE	
+NULL	MTR	T2	TABLE	NULL
-	MTR	V1	VIEW	
+NULL	MTR	V1	VIEW	NULL
 DROP TABLE t1;
 # All tables in all schemas (filtered with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT
@@ -24,9 +24,9 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables TABNAME='%.%';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
-	MTR	T2	TABLE	
+NULL	MTR	T2	TABLE	NULL
-	MTR	V1	VIEW	
+NULL	MTR	V1	VIEW	NULL
 DROP TABLE t1;
 # All tables "T1" in all schemas (filtered with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT
@@ -34,7 +34,7 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables TABNAME='%.T1';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
 DROP TABLE t1;
 # All tables "T1" in all schemas (filtered with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT
@@ -42,7 +42,7 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables TABNAME='T1';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
 DROP TABLE t1;
 # Table "T1" in the schema "MTR"
 CREATE TABLE t1 ENGINE=CONNECT
@@ -50,7 +50,7 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables TABNAME='MTR.T1';
 SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
 DROP TABLE t1;
 # All tables in the schema "MTR"
 CREATE TABLE t1 ENGINE=CONNECT
@@ -58,9 +58,9 @@ TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
 CATFUNC=Tables TABNAME='MTR.%';
 SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-	MTR	T1	TABLE	
+NULL	MTR	T1	TABLE	NULL
-	MTR	T2	TABLE	
+NULL	MTR	T2	TABLE	NULL
-	MTR	V1	VIEW	
+NULL	MTR	V1	VIEW	NULL
 DROP TABLE t1;
 #
 # Checking CATFUNC=Columns
@@ -73,10 +73,10 @@ CATFUNC=Columns;
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 	MTR	T1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	T1	B	6	NUMBER	38	40	0	0	1	
+	MTR	T1	B	6	NUMBER	38	40	NULL	NULL	1	
-	MTR	T2	A	12	VARCHAR2	64	64	0	0	1	
+	MTR	T2	A	12	VARCHAR2	64	64	NULL	NULL	1	
 	MTR	V1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	V1	B	6	NUMBER	38	40	0	0	1	
+	MTR	V1	B	6	NUMBER	38	40	NULL	NULL	1	
 DROP TABLE t1;
 # All columns in all schemas (limited with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT
@@ -85,17 +85,17 @@ CATFUNC=Columns TABNAME='%.%';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 	MTR	T1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	T1	B	6	NUMBER	38	40	0	0	1	
+	MTR	T1	B	6	NUMBER	38	40	NULL	NULL	1	
-	MTR	T2	A	12	VARCHAR2	64	64	0	0	1	
+	MTR	T2	A	12	VARCHAR2	64	64	NULL	NULL	1	
 	MTR	V1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	V1	B	6	NUMBER	38	40	0	0	1	
+	MTR	V1	B	6	NUMBER	38	40	NULL	NULL	1	
 DROP TABLE t1;
 # All tables "T1" in all schemas (limited with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.T1';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 	MTR	T1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	T1	B	6	NUMBER	38	40	0	0	1	
+	MTR	T1	B	6	NUMBER	38	40	NULL	NULL	1	
 DROP TABLE t1;
 # Table "T1" in the schema "MTR"
 CREATE TABLE t1 ENGINE=CONNECT
@@ -104,7 +104,7 @@ CATFUNC=Columns TABNAME='MTR.T1';
 SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 	MTR	T1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	T1	B	6	NUMBER	38	40	0	0	1	
+	MTR	T1	B	6	NUMBER	38	40	NULL	NULL	1	
 DROP TABLE t1;
 # All tables "T1" in all schemas (filtered with WHERE)
 CREATE TABLE t1 ENGINE=CONNECT
@@ -113,7 +113,7 @@ CATFUNC=Columns TABNAME='%.T1';
 SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 	MTR	T1	A	3	DECIMAL	38	40	0	10	1	
-	MTR	T1	B	6	NUMBER	38	40	0	0	1	
+	MTR	T1	B	6	NUMBER	38	40	NULL	NULL	1	
 DROP TABLE t1;
 #
 # Checking tables
@@ -127,32 +127,32 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `A` decimal(40,0) DEFAULT NULL,
-  `B` double(40,0) DEFAULT NULL
+  `B` double DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='T1'
 SELECT * FROM t1 ORDER BY A;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 CREATE TABLE t2 AS SELECT * FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
  `A` decimal(40,0) DEFAULT NULL,
-  `B` double(40,0) DEFAULT NULL
+  `B` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM t2;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 DROP TABLE t2;
 CREATE VIEW v1 AS SELECT * FROM t1;
 SELECT * FROM v1;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 DROP VIEW v1;
 DROP TABLE t1;
 # Table "T1" in the schema "MTR"
@@ -163,13 +163,13 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `A` decimal(40,0) DEFAULT NULL,
-  `B` double(40,0) DEFAULT NULL
+  `B` double DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.T1'
 SELECT * FROM t1;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 DROP TABLE t1;
 # View "V1" in the schema "MTR"
 CREATE TABLE t1 ENGINE=CONNECT
@@ -179,32 +179,32 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `A` decimal(40,0) DEFAULT NULL,
-  `B` double(40,0) DEFAULT NULL
+  `B` double DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.V1'
 SELECT * FROM t1;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 CREATE TABLE t2 AS SELECT * FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
  `A` decimal(40,0) DEFAULT NULL,
-  `B` double(40,0) DEFAULT NULL
+  `B` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT * FROM t2;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 DROP TABLE t2;
 CREATE VIEW v1 AS SELECT * FROM t1;
 SELECT * FROM v1;
 A	B
 10	1000000000
 20	1000000000000
-30	1000000000000000
+30	1e15
 DROP VIEW v1;
 DROP TABLE t1;
 # Table "T2" in the schema "MTR"

--- a/storage/connect/mysql-test/connect/r/odbc_postgresql.result
+++ b/storage/connect/mysql-test/connect/r/odbc_postgresql.result
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Name` varchar(256) NOT NULL,
-  `Description` varchar(256) NOT NULL
+  `Description` varchar(256) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
 SET NAMES utf8;
 #
@@ -99,9 +99,9 @@ Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Bu
 mtr	public	t1	a	4	int4	10	4	0	10	0	
 mtr	public	t2	a	4	int4	10	4	0	10	0	
 mtr	public	v1	a	4	int4	10	4	0	10	1	
-mtr	schema1	t1	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t1	a	1	bpchar	10	60	NULL	NULL	0	
-mtr	schema1	t2	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t2	a	1	bpchar	10	60	NULL	NULL	0	
-mtr	schema1	v1	a	1	bpchar	10	60	0	0	1	
+mtr	schema1	v1	a	1	bpchar	10	60	NULL	NULL	1	
 DROP TABLE t1;
 # 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='%.%.%';
@@ -110,16 +110,16 @@ Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Bu
 mtr	public	t1	a	4	int4	10	4	0	10	0	
 mtr	public	t2	a	4	int4	10	4	0	10	0	
 mtr	public	v1	a	4	int4	10	4	0	10	1	
-mtr	schema1	t1	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t1	a	1	bpchar	10	60	NULL	NULL	0	
-mtr	schema1	t2	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t2	a	1	bpchar	10	60	NULL	NULL	0	
-mtr	schema1	v1	a	1	bpchar	10	60	0	0	1	
+mtr	schema1	v1	a	1	bpchar	10	60	NULL	NULL	1	
 DROP TABLE t1;
 # 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_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 mtr	public	t1	a	4	int4	10	4	0	10	0	
-mtr	schema1	t1	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t1	a	1	bpchar	10	60	NULL	NULL	0	
 DROP TABLE t1;
 # 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';
@@ -131,14 +131,14 @@ DROP TABLE t1;
 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_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
-mtr	schema1	t1	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t1	a	1	bpchar	10	60	NULL	NULL	0	
 DROP TABLE t1;
 # 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_Schema, Table_Name;
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
 mtr	public	t1	a	4	int4	10	4	0	10	0	
-mtr	schema1	t1	a	1	bpchar	10	60	0	0	0	
+mtr	schema1	t1	a	1	bpchar	10	60	NULL	NULL	0	
 DROP TABLE t1;
 #
 # Checking tables

--- a/storage/connect/mysql-test/connect/r/odbc_sqlite3.result
+++ b/storage/connect/mysql-test/connect/r/odbc_sqlite3.result
--- a/storage/connect/mysql-test/connect/r/odbc_sqlite3_grant.result
+++ b/storage/connect/mysql-test/connect/r/odbc_sqlite3_grant.result
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Description` char(128) NOT NULL,
-  `Attributes` varchar(256) NOT NULL
+  `Attributes` varchar(256) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Drivers'
 SET NAMES utf8;
 GRANT ALL PRIVILEGES ON *.* TO user@localhost;

--- a/storage/connect/mysql-test/connect/r/odbc_xls.result
+++ b/storage/connect/mysql-test/connect/r/odbc_xls.result
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `Name` varchar(256) NOT NULL,
-  `Description` varchar(256) NOT NULL
+  `Description` varchar(256) DEFAULT NULL
 ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
 CREATE TABLE contact (Nom VARCHAR(128), Fonction VARCHAR(128), Company VARCHAR(128), Repertoire VARCHAR(30)) ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=DATADIR/test/contacts.xls';;
 SELECT Nom, Fonction FROM contact WHERE Repertoire='ascii';
@@ -16,11 +16,11 @@ DROP TABLE contact;
 CREATE TABLE t1 ENGINE=CONNECT CATFUNC=Tables TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=DATADIR/test/contacts.xls' CHARSET=utf8 DATA_CHARSET=latin1;;
 SELECT * FROM t1 WHERE Table_name='CONTACT';
 Table_Cat	Table_Schema	Table_Name	Table_Type	Remark
-DATADIR/test/contacts		CONTACT	TABLE	
+DATADIR/test/contacts	NULL	CONTACT	TABLE	NULL
 DROP TABLE t1;
 CREATE TABLE t1 ENGINE=CONNECT CATFUNC=Columns TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=DATADIR/test/contacts.xls' CHARSET=utf8 DATA_CHARSET=latin1;;
 SELECT * FROM t1 WHERE Table_name='CONTACT' AND Column_name IN ('Nom','Fonction');
 Table_Cat	Table_Schema	Table_Name	Column_Name	Data_Type	Type_Name	Column_Size	Buffer_Length	Decimal_Digits	Radix	Nullable	Remarks
-DATADIR/test/contacts		CONTACT	Nom	12	VARCHAR	255	510	0	0	1	
+DATADIR/test/contacts	NULL	CONTACT	Nom	12	VARCHAR	255	510	NULL	NULL	1	NULL
-DATADIR/test/contacts		CONTACT	Fonction	12	VARCHAR	255	510	0	0	1	
+DATADIR/test/contacts	NULL	CONTACT	Fonction	12	VARCHAR	255	510	NULL	NULL	1	NULL
 DROP TABLE t1;
--- a/storage/connect/mysql-test/connect/t/json_udf.inc
+++ b/storage/connect/mysql-test/connect/t/json_udf.inc
@@ -20,6 +20,8 @@ if (!$HA_CONNECT_SO) {
 --eval CREATE FUNCTION json_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION json_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonvalue RETURNS STRING SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonset_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO';
+--eval CREATE FUNCTION jsonget_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO';
 --eval CREATE AGGREGATE FUNCTION json_array_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE AGGREGATE FUNCTION json_object_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
 --eval CREATE FUNCTION jsonget_string RETURNS STRING SONAME '$HA_CONNECT_SO';

--- a/storage/connect/mysql-test/connect/t/json_udf.test
+++ b/storage/connect/mysql-test/connect/t/json_udf.test
@@ -108,7 +108,8 @@ CREATE TABLE t3 (
 SELECT Json_Object(SERIALNO, NAME, TITLE, SALARY) FROM t3 WHERE NAME = 'MERCHANT';
 SELECT DEPARTMENT, Json_Array_Grp(NAME) FROM t3 GROUP BY DEPARTMENT;
-SET connect_json_grp_size=30;
+#SET connect_json_grp_size=30;           Deprecated
+SELECT JsonSet_Grp_Size(30);
 SELECT Json_Object(title, Json_Array_Grp(name) `json_names`) from t3 GROUP BY title;
 SELECT Json_Array(DEPARTMENT, Json_Array_Grp(NAME)) FROM t3 GROUP BY DEPARTMENT;
 SELECT Json_Object(DEPARTMENT, Json_Array_Grp(NAME) json_NAMES) FROM t3 GROUP BY DEPARTMENT;

--- a/storage/connect/mysql-test/connect/t/json_udf2.inc
+++ b/storage/connect/mysql-test/connect/t/json_udf2.inc
@@ -11,6 +11,8 @@ DROP FUNCTION json_object_add;
 DROP FUNCTION json_object_delete;
 DROP FUNCTION json_object_list;
 DROP FUNCTION jsonvalue;
+DROP FUNCTION jsonset_grp_size;
+DROP FUNCTION jsonget_grp_size;
 DROP FUNCTION json_array_grp;
 DROP FUNCTION json_object_grp;
 DROP FUNCTION jsonget_string;

--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
 /************ Odbconn C++ Functions Source Code File (.CPP) ************/
 /*  Name: ODBCONN.CPP  Version 2.2                                     */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          1998-2015    */
+/*  (C) Copyright to the author Olivier BERTRAND          1998-2016    */
 /*                                                                     */
 /*  This file contains the ODBC connection classes functions.          */
 /***********************************************************************/
@@ -314,8 +314,10 @@ PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *db, char *table,
                   FLD_TYPE,  FLD_TYPENAME, FLD_PREC,    FLD_LENGTH,
                   FLD_SCALE, FLD_RADIX,    FLD_NULL,    FLD_REM};
  unsigned int length[] = {0, 0, 0, 0, 6, 0, 10, 10, 6, 6, 6, 0};
-  int      n, ncol = 12;
+	bool     b[] = {true,true,false,false,false,false,false,false,true,true,false,true};
-  PQRYRES  qrp;
+  int      i, n, ncol = 12;
+	PCOLRES  crp;
+	PQRYRES  qrp;
  CATPARM *cap;
  ODBConn *ocp = NULL;
@@ -363,6 +365,10 @@ PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *db, char *table,
  qrp = PlgAllocResult(g, ncol, maxres, IDS_COLUMNS,
                          buftyp, fldtyp, length, false, true);
+	for (i = 0, crp = qrp->Colresp; crp; i++, crp = crp->Next)
+		if (b[i])
+			crp->Kdata->SetNullable(true);
  if (info || !qrp)                      // Info table
    return qrp;
@@ -495,8 +501,10 @@ PQRYRES ODBCDrivers(PGLOBAL g, int maxres, bool info)
  int      buftyp[] = {TYPE_STRING, TYPE_STRING};
  XFLD     fldtyp[] = {FLD_NAME, FLD_REM};
  unsigned int length[] = {128, 256};
-  int      ncol = 2;
+	bool     b[] = {false, true};
-  PQRYRES  qrp;
+	int      i, ncol = 2;
+	PCOLRES  crp;
+	PQRYRES  qrp;
  ODBConn *ocp = NULL;
  /************************************************************************/
@@ -520,7 +528,11 @@ PQRYRES ODBCDrivers(PGLOBAL g, int maxres, bool info)
  qrp = PlgAllocResult(g, ncol, maxres, IDS_DRIVER, 
                          buftyp, fldtyp, length, false, true);
-  /************************************************************************/
+	for (i = 0, crp = qrp->Colresp; crp; i++, crp = crp->Next)
+		if (b[i])
+			crp->Kdata->SetNullable(true);
+	/************************************************************************/
  /*  Now get the results into blocks.                                    */
  /************************************************************************/
  if (!info && qrp && ocp->GetDrivers(qrp))
@@ -542,8 +554,10 @@ PQRYRES ODBCDataSources(PGLOBAL g, int maxres, bool info)
  int      buftyp[] = {TYPE_STRING, TYPE_STRING};
  XFLD     fldtyp[] = {FLD_NAME, FLD_REM};
  unsigned int length[] = {0, 256};
-  int      n = 0, ncol = 2;
+	bool     b[] = {false, true};
-  PQRYRES  qrp;
+	int      i, n = 0, ncol = 2;
+	PCOLRES  crp;
+	PQRYRES  qrp;
  ODBConn *ocp = NULL;
  /************************************************************************/
@@ -571,7 +585,11 @@ PQRYRES ODBCDataSources(PGLOBAL g, int maxres, bool info)
  qrp = PlgAllocResult(g, ncol, maxres, IDS_DSRC, 
                          buftyp, fldtyp, length, false, true);
-  /************************************************************************/
+	for (i = 0, crp = qrp->Colresp; crp; i++, crp = crp->Next)
+		if (b[i])
+			crp->Kdata->SetNullable(true);
+	/************************************************************************/
  /*  Now get the results into blocks.                                    */
  /************************************************************************/
  if (!info && qrp && ocp->GetDataSources(qrp))
@@ -595,8 +613,10 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat,
  XFLD     fldtyp[] = {FLD_CAT,  FLD_SCHEM, FLD_NAME,
                       FLD_TYPE, FLD_REM};
  unsigned int length[] = {0, 0, 0, 16, 0};
-  int      n, ncol = 5;
+	bool     b[] ={ true, true, false, false, true };
-  PQRYRES  qrp;
+	int      i, n, ncol = 5;
+	PCOLRES  crp;
+	PQRYRES  qrp;
  CATPARM *cap;
  ODBConn *ocp = NULL;
@@ -638,7 +658,11 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat,
  qrp = PlgAllocResult(g, ncol, maxres, IDS_TABLES, buftyp,
                                        fldtyp, length, false, true);
-  if (info || !qrp)
+	for (i = 0, crp = qrp->Colresp; crp; i++, crp = crp->Next)
+		if (b[i])
+			crp->Kdata->SetNullable(true);
+	if (info || !qrp)
    return qrp;
  if (!(cap = AllocCatInfo(g, CAT_TAB, db, tabpat, qrp)))
@@ -2249,7 +2273,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
        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);
+															cap->Pat, cap->Pat ? SQL_NTS : 0);
        break;
      case CAT_COL:
 //      rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
@@ -2258,7 +2282,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
        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);
+															 cap->Pat, cap->Pat ? SQL_NTS : 0);
        break;
      case CAT_KEY:
        fnc = "SQLPrimaryKeys";

--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -679,7 +679,8 @@ void PlugConvertConstant(PGLOBAL g, void* & value, short& type)
 /*  non quoted blanks are not included in the output format.           */
 /***********************************************************************/
 PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
-  {
+{
+	int  rc;
  PDTP pdp = (PDTP)PlugSubAlloc(g, NULL, sizeof(DATPAR));
  if (trace)
@@ -708,7 +709,7 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
  pthread_mutex_lock(&parmut);
 #endif  // !__WIN__
 #endif  //  THREAD
-  /*int rc =*/ fmdflex(pdp);
+  rc = fmdflex(pdp);
 #if defined(THREAD)
 #if defined(__WIN__)
  LeaveCriticalSection((LPCRITICAL_SECTION)&parsec);
@@ -718,9 +719,10 @@ PDTP MakeDateFormat(PGLOBAL g, PSZ dfmt, bool in, bool out, int flag)
 #endif  //  THREAD
  if (trace)
-    htrc("Done:  in=%s out=%s\n", SVP(pdp->InFmt), SVP(pdp->OutFmt));           
+    htrc("Done: in=%s out=%s rc=%d\n", SVP(pdp->InFmt), SVP(pdp->OutFmt), rc);
  return pdp;
-  } // end of MakeDateFormat
+} // end of MakeDateFormat
 /***********************************************************************/
 /* Extract the date from a formatted string according to format.       */

--- a/storage/connect/reldef.cpp
+++ b/storage/connect/reldef.cpp
 /************* RelDef CPP Program Source Code File (.CPP) **************/
 /* PROGRAM NAME: RELDEF                                                */
 /* -------------                                                       */
-/*  Version 1.4                                                        */
+/*  Version 1.5                                                        */
 /*                                                                     */
 /* COPYRIGHT:                                                          */
 /* ----------                                                          */
-/*  (C) Copyright to the author Olivier BERTRAND          2004-2015    */
+/*  (C) Copyright to the author Olivier BERTRAND          2004-2016    */
 /*                                                                     */
 /* WHAT THIS PROGRAM DOES:                                             */
 /* -----------------------                                             */
@@ -37,6 +37,7 @@
 #include "plgdbsem.h"
 #include "reldef.h"
 #include "colblk.h"
+#include "tabcol.h"
 #include "filamap.h"
 #include "filamfix.h"
 #include "filamvct.h"
@@ -217,11 +218,13 @@ TABDEF::TABDEF(void)
 /***********************************************************************/
 /*  Define: initialize the table definition block from XDB file.       */
 /***********************************************************************/
-bool TABDEF::Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am)
+bool TABDEF::Define(PGLOBAL g, PCATLG cat, 
+	                  LPCSTR name, LPCSTR schema, LPCSTR am)
  {
  int   poff = 0;
-  Name = (PSZ)PlugDup(g, name);
+  Name = (PSZ)name;
+	Schema = (PSZ)schema;
  Cat = cat;
  Hc = ((MYCAT*)cat)->GetHandler();
  Catfunc = GetFuncID(GetStringCatInfo(g, "Catfunc", NULL));
@@ -569,7 +572,7 @@ PTABDEF OEMDEF::GetXdef(PGLOBAL g)
    } // endif Cbuf
  // Here "OEM" should be replace by a more useful value
-  if (xdefp->Define(g, cat, Name, "OEM"))
+  if (xdefp->Define(g, cat, Name, Schema, "OEM"))
    return NULL;
  // Ok, return external block

--- a/storage/connect/reldef.h
+++ b/storage/connect/reldef.h
 /*************** RelDef H Declares Source Code File (.H) ***************/
-/*  Name: RELDEF.H  Version 1.5                                        */
+/*  Name: RELDEF.H  Version 1.6                                        */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          2004-2015    */
+/*  (C) Copyright to the author Olivier BERTRAND          2004-2016    */
 /*                                                                     */
 /*  This file contains the DEF classes definitions.                    */
 /***********************************************************************/
@@ -50,7 +50,8 @@ class DllExport RELDEF : public BLOCK {      // Relation definition block
  int     GetCharCatInfo(PSZ what, PSZ sdef, char *buf, int size);
  char   *GetStringCatInfo(PGLOBAL g, PSZ what, PSZ sdef);
  virtual int  Indexable(void) {return 0;}
-  virtual bool Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am) = 0;
+  virtual bool Define(PGLOBAL g, PCATLG cat, 
+		                  LPCSTR name, LPCSTR schema, LPCSTR am) = 0;
  virtual PTDB GetTable(PGLOBAL g, MODE mode) = 0;
 protected:
@@ -97,8 +98,9 @@ class DllExport TABDEF : public RELDEF {   /* Logical table descriptor */
          int  GetColCatInfo(PGLOBAL g);
          void SetIndexInfo(void);
          bool DropTable(PGLOBAL g, PSZ name);
-  virtual bool Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am);
+	virtual bool Define(PGLOBAL g, PCATLG cat,
-  virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0;
+						          LPCSTR name, LPCSTR schema, LPCSTR am);
+	virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0;
 protected:
  // Members

--- a/storage/connect/table.cpp
+++ b/storage/connect/table.cpp
 /************** Table C++ Functions Source Code File (.CPP) ************/
 /*  Name: TABLE.CPP  Version 2.7                                       */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          1999-2015    */
+/*  (C) Copyright to the author Olivier BERTRAND          1999-2016    */
 /*                                                                     */
 /*  This file contains the TBX, TDB and OPJOIN classes functions.      */
 /***********************************************************************/
@@ -518,7 +518,8 @@ bool TDBCAT::InitCol(PGLOBAL g)
      sprintf(g->Message, "Invalid flag %d for column %s",
                          colp->Flag, colp->Name);
      return true;
-      } // endif Crp
+		} else if (crp->Fld == FLD_SCALE || crp->Fld == FLD_RADIX)
+			colp->Value->SetNullable(true);
    } // endfor colp
@@ -586,11 +587,14 @@ CATCOL::CATCOL(PCOLDEF cdp, PTDB tdbp, int n)
 /***********************************************************************/
 void CATCOL::ReadColumn(PGLOBAL)
  {
+	bool b = (!Crp->Kdata || Crp->Kdata->IsNull(Tdbp->N));
  // Get the value of the Name or Description property
-  if (Crp->Kdata)
+  if (!b)
    Value->SetValue_pvblk(Crp->Kdata, Tdbp->N);
  else
    Value->Reset();
+	Value->SetNull(b);
  } // end of ReadColumn
--- a/storage/connect/tabmysql.cpp
+++ b/storage/connect/tabmysql.cpp
@@ -334,7 +334,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCSTR am, int)
    Delayed = !!GetIntCatInfo("Delayed", 0);
  } else {
    // MYSQL access from a PROXY table 
-    Database = GetStringCatInfo(g, "Database", "*");
+    Database = GetStringCatInfo(g, "Database", Schema ? Schema : "*");
    Isview = GetBoolCatInfo("View", false);
    // We must get other connection parms from the calling table

--- a/storage/connect/tabpivot.cpp
+++ b/storage/connect/tabpivot.cpp
@@ -348,7 +348,7 @@ bool PIVOTDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
    return TRUE;
  Tabname = (char*)Tablep->GetName();
-  DB = (char*)Tablep->GetQualifier();
+  DB = (char*)Tablep->GetSchema();
  Tabsrc = (char*)Tablep->GetSrc();
  Host = GetStringCatInfo(g, "Host", "localhost");
@@ -529,7 +529,7 @@ bool TDBPIVOT::GetSourceTable(PGLOBAL g)
    // Get the new table description block of this source table
    PTABLE tablep = new(g) XTAB("whatever", Tabsrc);
-    tablep->SetQualifier(Database);
+    tablep->SetSchema(Database);
    if (!(Tdbp = GetSubTable(g, tablep, true)))
      return true;

--- a/storage/connect/tabtbl.cpp
+++ b/storage/connect/tabtbl.cpp
@@ -5,7 +5,7 @@
 /*                                                                     */
 /* COPYRIGHT:                                                          */
 /* ----------                                                          */
-/*  (C) Copyright to PlugDB Software Development          2008-2015    */
+/*  (C) Copyright to PlugDB Software Development          2008-2016    */
 /*  Author: Olivier BERTRAND                                           */
 /*                                                                     */
 /* WHAT THIS PROGRAM DOES:                                             */
@@ -130,10 +130,10 @@ bool TBLDEF::DefineAM(PGLOBAL g, LPCSTR, int)
      // Allocate the TBLIST block for that table
      tbl = new(g) XTAB(pn, def);
-      tbl->SetQualifier(pdb);
+      tbl->SetSchema(pdb);
      if (trace)
-        htrc("TBL: Name=%s db=%s\n", tbl->GetName(), tbl->GetQualifier());
+        htrc("TBL: Name=%s db=%s\n", tbl->GetName(), tbl->GetSchema());
      // Link the blocks
      if (Tablep)

--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
 /************* Tabutil cpp Declares Source Code File (.CPP) ************/
 /*  Name: TABUTIL.CPP   Version 1.1                                    */
 /*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          2013 - 2015  */
+/*  (C) Copyright to the author Olivier BERTRAND          2013 - 2016  */
 /*                                                                     */
 /*  Utility function used by the PROXY, XCOL, OCCUR, and TBL tables.   */
 /***********************************************************************/
@@ -118,7 +118,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
                   FLD_LENGTH, FLD_SCALE, FLD_RADIX,    FLD_NULL,
                   FLD_REM,    FLD_NO,    FLD_CHARSET};
  unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 32};
-  char        *fld, *colname, *chset, *fmt, v;
+  char        *pn, *tn, *fld, *colname, *chset, *fmt, v;
  int          i, n, ncol = sizeof(buftyp) / sizeof(int);
  int          prec, len, type, scale;
  int          zconv = GetConvSize();
@@ -130,7 +130,16 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
  PCOLRES      crp;
  if (!info) {
-    if (!(s = GetTableShare(g, thd, db, name, mysql))) {
+		// Analyze the table name, it may have the format: [dbname.]tabname
+		if (strchr((char*)name, '.')) {
+			tn = (char*)PlugDup(g, name);
+			pn = strchr(tn, '.');
+			*pn++ = 0;
+			db = tn;
+			name = pn;
+		} // endif pn
+		if (!(s = GetTableShare(g, thd, db, name, mysql))) {
      return NULL;
    } else if (s->is_view) {
      strcpy(g->Message, "Use MYSQL type to see columns from a view");
@@ -315,7 +324,7 @@ bool PRXDEF::DefineAM(PGLOBAL g, LPCSTR, int)
      } // endif pn
  Tablep = new(g) XTAB(tab, def);
-  Tablep->SetQualifier(db);
+  Tablep->SetSchema(db);
  return false;
  } // end of DefineAM
@@ -379,12 +388,12 @@ PTDBASE TDBPRX::GetSubTable(PGLOBAL g, PTABLE tabp, bool b)
  LPCSTR       cdb, curdb = hc->GetDBName(NULL);
  THD         *thd = (hc->GetTable())->in_use;
-  db = (char*)tabp->GetQualifier();
+  db = (char*)(tabp->GetSchema() ? tabp->GetSchema() : curdb);
  name = (char*)tabp->GetName();
  // Check for eventual loop
  for (PTABLE tp = To_Table; tp; tp = tp->Next) {
-    cdb = (tp->Qualifier) ? tp->Qualifier : curdb;
+    cdb = (tp->Schema) ? tp->Schema : curdb;
    if (!stricmp(name, tp->Name) && !stricmp(db, cdb)) {
      sprintf(g->Message, "Table %s.%s pointing on itself", db, name);
@@ -423,7 +432,7 @@ PTDBASE TDBPRX::GetSubTable(PGLOBAL g, PTABLE tabp, bool b)
      } // endif Define
    if (db)
-      ((PTDBMY)tdbp)->SetDatabase(tabp->GetQualifier());
+      ((PTDBMY)tdbp)->SetDatabase(tabp->GetSchema());
    if (Mode == MODE_UPDATE || Mode == MODE_DELETE)
      tdbp->SetName(Name);      // For Make_Command
@@ -757,7 +766,7 @@ void PRXCOL::WriteColumn(PGLOBAL g)
 /***********************************************************************/
 TDBTBC::TDBTBC(PPRXDEF tdp) : TDBCAT(tdp)
  {
-  Db  = (PSZ)tdp->Tablep->GetQualifier();    
+  Db  = (PSZ)tdp->Tablep->GetSchema();    
  Tab = (PSZ)tdp->Tablep->GetName();    
  } // end of TDBTBC constructor

--- a/storage/connect/valblk.h
+++ b/storage/connect/valblk.h
@@ -73,7 +73,8 @@ class VALBLK : public BLOCK {
  virtual void   SetNull(int n, bool b)
                  {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   IsNullable(void) {return Nullable;}
+	virtual void   SetNullable(bool b);
  virtual bool   IsUnsigned(void) {return Unsigned;}
  virtual bool   Init(PGLOBAL g, bool check) = 0;
  virtual int    GetVlen(void) = 0;