Merge connect/10.0 into 10.0

Squash all connect/10.0's commits into one and keep only changes from storage/connect directory.

Author: cvicentiu

storage/connect/array.cpp

@@ -520,7 +520,7 @@ bool ARRAY::FilTest(PGLOBAL g, PVAL valp, OPVAL opc, int opm)
 
  } else if (opc != OP_EXIST) {
 sprintf(g->Message, MSG(MISSING_ARG), opc);
-throwTYPE_ARRAY;
+throw (int)TYPE_ARRAY;
  } else // OP_EXIST
  return Nval > 0;
 
@@ -683,14 +683,14 @@ void ARRAY::SetPrecision(PGLOBAL g, int p)
  {
  if (Vblp == NULL) {
  strcpy(g->Message, MSG(PREC_VBLP_NULL));
-throw TYPE_ARRAY;
+throw (int)TYPE_ARRAY;
  } // endif Vblp
 
  bool was = Vblp->IsCi();
 
  if (was && !p) {
  strcpy(g->Message, MSG(BAD_SET_CASE));
-throw TYPE_ARRAY;
+throw (int)TYPE_ARRAY;
 } // endif Vblp
 
  if (was || !p)
@@ -701,7 +701,7 @@ void ARRAY::SetPrecision(PGLOBAL g, int p)
  if (!was && Type == TYPE_STRING)
  // Must be resorted to eliminate duplicate strings
  if (Sort(g))
-throw TYPE_ARRAY;
+throw (int)TYPE_ARRAY;
 
  } // end of SetPrecision
 
@@ -1035,7 +1035,7 @@ void ARRAY::Printf(PGLOBAL g, FILE *f, uint n)
  } else
  fprintf(f, "%sVALLST: numval=%d\n", m, Nval);
 
- } // end of Print
+ } // end of Printf
 
 /***********************************************************************/
 /* Make string output of ARRAY contents. */
@@ -1047,7 +1047,7 @@ void ARRAY::Prints(PGLOBAL, char *ps, uint z)
 
  sprintf(ps, "ARRAY: type=%d\n", Type);
  // More to be implemented later
- } // end of Print
+ } // end of Prints
 
 /* -------------------------- Class MULAR ---------------------------- */
 

storage/connect/blkfil.cpp

@@ -65,15 +65,15 @@ void BLOCKFILTER::Printf(PGLOBAL, FILE *f, uint n)
 
  fprintf(f, "%sBLOCKFILTER: at %p opc=%d opm=%d result=%d\n",
  m, this, Opc, Opm, Result);
- } // end of Print
+ } // end of Printf
 
 /***********************************************************************/
 /* Make string output of BLOCKFILTER contents. */
 /***********************************************************************/
 void BLOCKFILTER::Prints(PGLOBAL, char *ps, uint z)
  {
  strncat(ps, "BlockFilter(s)", z);
- } // end of Print
+ } // end of Prints
 
 
 /* ---------------------- Class BLKFILLOG ---------------------------- */
@@ -1006,17 +1006,17 @@ void BLOCKINDEX::Printf(PGLOBAL g, FILE *f, UINT n)
  m, this, Next, (Colp) ? Colp->GetName() : "Rowid", Kxp, Result);
 
  if (Next)
- Next->Print(g, f, n);
+ Next->Printf(g, f, n);
 
- } // end of Print
+ } // end of Printf
 
 /***********************************************************************/
 /* Make string output of BLOCKINDEX contents. */
 /***********************************************************************/
 void BLOCKINDEX::Prints(PGLOBAL g, char *ps, UINT z)
  {
  strncat(ps, "BlockIndex(es)", z);
- } // end of Print
+ } // end of Prints
 
 /* ------------------------------------------------------------------- */
 

storage/connect/colblk.cpp

@@ -197,7 +197,7 @@ int COLBLK::GetLengthEx(void)
 void COLBLK::ReadColumn(PGLOBAL g)
 {
  sprintf(g->Message, MSG(UNDEFINED_AM), "ReadColumn");
-throw TYPE_COLBLK;
+throw (int)TYPE_COLBLK;
 } // end of ReadColumn
 
 /***********************************************************************/
@@ -208,7 +208,7 @@ void COLBLK::ReadColumn(PGLOBAL g)
 void COLBLK::WriteColumn(PGLOBAL g)
 {
  sprintf(g->Message, MSG(UNDEFINED_AM), "WriteColumn");
-throw TYPE_COLBLK;
+throw (int)TYPE_COLBLK;
 } // end of WriteColumn
 
 /***********************************************************************/
@@ -232,15 +232,15 @@ void COLBLK::Printf(PGLOBAL, FILE *f, uint n)
  fprintf(f,
  " coluse=%04X status=%04X buftyp=%d value=%p name=%s\n",
  ColUse, Status, Buf_Type, Value, Name);
- } // end of Print
+ } // end of Printf
 
 /***********************************************************************/
 /* Make string output of a column descriptor block. */
 /***********************************************************************/
 void COLBLK::Prints(PGLOBAL, char *ps, uint)
  {
  sprintf(ps, "R%d.%s", To_Tdb->GetTdb_No(), Name);
- } // end of Print
+ } // end of Prints
 
 
 /***********************************************************************/
@@ -262,7 +262,7 @@ SPCBLK::SPCBLK(PCOLUMN cp)
 void SPCBLK::WriteColumn(PGLOBAL g)
 {
  sprintf(g->Message, MSG(SPCOL_READONLY), Name);
-throw TYPE_COLBLK;
+throw (int)TYPE_COLBLK;
 } // end of WriteColumn
 
 /***********************************************************************/

storage/connect/connect.cc

@@ -1,4 +1,5 @@
 /* Copyright (C) Olivier Bertrand 2004 - 2017
+ Copyright (C) MariaDB Corporation Ab
 
  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
@@ -66,8 +67,10 @@ PGLOBAL CntExit(PGLOBAL g)
  if (g) {
  CntEndDB(g);
 
- if (g->Activityp)
- delete g->Activityp;
+if (g->Activityp) {
+delete g->Activityp;
+g->Activityp = NULL;
+}// endif Activityp
 
  PlugExit(g);
  g= NULL;
@@ -185,10 +188,10 @@ bool CntInfo(PGLOBAL g, PTDB tp, PXF info)
 /***********************************************************************/
 PTDB CntGetTDB(PGLOBAL g, LPCSTR name, MODE mode, PHC h)
 {
-PTDB tdbp;
+PTDB tdbp = NULL;
 PTABLE tabp;
 PDBUSER dup = PlgGetUser(g);
-volatile PCATLG cat = (dup) ? dup->Catalog : NULL;  // Safe over longjmp
+volatile PCATLG cat = (dup) ? dup->Catalog : NULL; // Safe over throw
 
 if (trace)
 printf("CntGetTDB: name=%s mode=%d cat=%p\n", name, mode, cat);

storage/connect/connect.h

@@ -1,4 +1,4 @@
-/* Copyright (C) Olivier Bertrand 2004 - 2011
+/* Copyright (C) MariaDB Corporation Ab
 
  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
@@ -15,6 +15,7 @@
 
 /**************** Cnt H Declares Source Code File (.H) *****************/
 /* Name: CONNECT.H Version 2.4 */
+/* Author Olivier BERTRAND bertrandop@gmail.com */
 /* This file contains the some based classes declares. */
 /***********************************************************************/
 #include "filamtxt.h"

storage/connect/engmsg.h

@@ -1,3 +1,4 @@
+/* Copyright (C) MariaDB Corporation Ab */
 #define MSG_ACCESS_VIOLATN "Access violation"
 #define MSG_ADD_BAD_TYPE "Array add value type mismatch (%s -> %s)"
 #define MSG_ALLOC_ERROR "Error allocating %s"

storage/connect/filter.cpp

@@ -87,7 +87,7 @@ BYTE OpBmp(PGLOBAL g, OPVAL opc)
  case OP_EXIST: bt = 0x00; break;
  default:
  sprintf(g->Message, MSG(BAD_FILTER_OP), opc);
-throw TYPE_ARRAY;
+throw (int)TYPE_FILTER;
 } // endswitch opc
 
  return bt;
@@ -1437,7 +1437,7 @@ void FILTER::Printf(PGLOBAL g, FILE *f, uint n)
 
  } // endfor fp
 
- } // end of Print
+ } // end of Printf
 
 /***********************************************************************/
 /* Make string output of TABLE contents (z should be checked). */
@@ -1579,7 +1579,7 @@ void FILTER::Prints(PGLOBAL g, char *ps, uint z)
  bcp = bxp;
  } while (bcp); // enddo
 
- } // end of Print
+ } // end of Prints
 
 
 /* -------------------- Derived Classes Functions -------------------- */
@@ -1697,8 +1697,6 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having)
 
  if (trace)
  htrc("PrepareFilter: fp=%p having=%d\n", fp, having);
-//if (fp)
-// fp->Print(g, debug, 0);
 
  while (fp) {
  if (fp->Opc == OP_SEP)
@@ -1712,7 +1710,7 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having)
  break; // Remove eventual ending separator(s)
 
 // if (fp->Convert(g, having))
-//	throw TYPE_ARRAY;
+//	throw (int)TYPE_FILTER;
 
  filp = fp;
  fp = fp->Next;
@@ -1721,8 +1719,6 @@ PFIL PrepareFilter(PGLOBAL g, PFIL fp, bool having)
 
  if (trace)
  htrc(" returning filp=%p\n", filp);
-//if (filp)
-// filp->Print(g, debug, 0);
 
  return filp;
  } // end of PrepareFilter
@@ -1745,7 +1741,7 @@ DllExport bool ApplyFilter(PGLOBAL g, PFIL filp)
 // return TRUE;
 
  if (filp->Eval(g))
-throw TYPE_FILTER;
+throw (int)TYPE_FILTER;
 
  if (trace > 1)
  htrc("PlugFilter filp=%p result=%d\n",

storage/connect/global.h

@@ -1,6 +1,7 @@
 /***********************************************************************/
 /* GLOBAL.H: Declaration file used by all CONNECT implementations. */
-/* (C) Copyright Olivier Bertrand 1993-2017 */
+/* (C) Copyright MariaDB Corporation Ab */
+/* Author Olivier Bertrand 1993-2017 */
 /***********************************************************************/
 
 /***********************************************************************/
@@ -90,6 +91,7 @@
 #define TYPE_BIGINT 5
 #define TYPE_LIST 6
 #define TYPE_INT 7
+#define TYPE_DATE 8
 #define TYPE_DECIM 9
 #define TYPE_BIN 10
 #define TYPE_PCHAR 11