Commiting merge from ob-10.0

storage/connect/CMakeLists.txt

@@ -28,8 +28,8 @@ tabvct.cpp tabvir.cpp tabxcl.cpp valblk.cpp value.cpp xindex.cpp xobject.cpp
 
 array.h blkfil.h block.h catalog.h checklvl.h colblk.h connect.h csort.h
 engmsg.h filamap.h filamdbf.h filamfix.h filamtxt.h filamvct.h filamzip.h
-filter.h global.h ha_connect.h inihandl.h json.h maputil.h msgid.h mycat.h
-myconn.h myutil.h os.h osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h
+filter.h global.h ha_connect.h inihandl.h json.h jsonudf.h maputil.h msgid.h
+mycat.h myconn.h myutil.h os.h osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h
 resource.h tabcol.h tabdos.h tabfix.h tabfmt.h tabjson.h tabmul.h tabmysql.h
 taboccur.h tabpivot.h tabsys.h tabtbl.h tabutil.h tabvct.h tabvir.h tabxcl.h
 user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)
@@ -48,7 +48,7 @@ IF(UNIX)
   # Bar: -Wfatal-errors removed (does not present in gcc on solaris10)
   if(WITH_WARNINGS)
     add_definitions(-Wall -Wextra -Wmissing-declarations)
-    message(STATUS "CONNECT: GCC: All warnings enabled")
+    #message(STATUS "CONNECT: GCC: All warnings enabled")
   else()
     add_definitions(-Wall -Wmissing-declarations)
     add_definitions(-Wno-write-strings)
@@ -69,7 +69,7 @@ IF(UNIX)
 # These switches are for C++ only
 #   add_definitions(-Wno-reorder)
 
-    message(STATUS "CONNECT: GCC: Some warnings disabled")
+    #message(STATUS "CONNECT: GCC: Some warnings disabled")
   endif(WITH_WARNINGS)
 
   add_definitions( -DUNIX -DLINUX -DUBUNTU )

storage/connect/connect.cc

@@ -735,17 +735,12 @@ static void SetSwapValue(PVAL valp, char *kp)
 /*  IndexRead: fetch a record having the index value.                  */
 /***********************************************************************/
 RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
-                   const void *key, int len, bool mrr)
+                   const key_range *kr, bool mrr)
   {
-  char   *kp= (char*)key;
   int     n, x;
-  short   lg;
-  bool    rcb;
   RCODE   rc;
-  PVAL    valp;
-  PCOL    colp;
   XXBASE *xbp;
-  PTDBDOX tdbp;
+	PTDBDOX tdbp;
 
   if (!ptdb)
     return RC_FX;
@@ -757,13 +752,13 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
     return RC_FX;
   } else if (x == 2) {
     // Remote index
-    if (ptdb->ReadKey(g, op, key, len))
+    if (ptdb->ReadKey(g, op, kr))
       return RC_FX;
 
     goto rnd;
   } else if (x == 3) {
-    if (key)
-      ((PTDBASE)ptdb)->SetRecpos(g, *(int*)key);
+    if (kr)
+      ((PTDBASE)ptdb)->SetRecpos(g, *(int*)kr->key);
 
     if (op == OP_SAME)
       return RC_NF;
@@ -790,7 +785,14 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
 
   xbp= (XXBASE*)tdbp->To_Kindex;
 
-  if (key) {
+  if (kr) {
+		char   *kp= (char*)kr->key;
+		int     len= kr->length;
+		short   lg;
+		bool    rcb;
+		PVAL    valp;
+		PCOL    colp;
+
     for (n= 0; n < tdbp->Knum; n++) {
       colp= (PCOL)tdbp->To_Key_Col[n];
 
@@ -832,10 +834,10 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op,
 
       kp+= valp->GetClen();
 
-      if (len == kp - (char*)key) {
+      if (len == kp - (char*)kr->key) {
         n++;
         break;
-      } else if (len < kp - (char*)key) {
+      } else if (len < kp - (char*)kr->key) {
         strcpy(g->Message, "Key buffer is too small");
         return RC_FX;
       } // endif len

storage/connect/connect.h

@@ -36,7 +36,7 @@ bool  CntRewindTable(PGLOBAL g, PTDB tdbp);
 int   CntCloseTable(PGLOBAL g, PTDB tdbp, bool nox, bool abort);
 int   CntIndexInit(PGLOBAL g, PTDB tdbp, int id, bool sorted);
 RCODE CntReadNext(PGLOBAL g, PTDB tdbp);
-RCODE CntIndexRead(PGLOBAL g, PTDB, OPVAL op, const void *k, int n, bool mrr); 
+RCODE CntIndexRead(PGLOBAL g, PTDB, OPVAL op, const key_range *kr, bool mrr); 
 RCODE CntWriteRow(PGLOBAL g, PTDB tdbp);
 RCODE CntUpdateRow(PGLOBAL g, PTDB tdbp);
 RCODE CntDeleteRow(PGLOBAL g, PTDB tdbp, bool all);
@@ -60,7 +60,7 @@ class TDBDOX: public TDBDOS {
   friend int   MakeIndex(PGLOBAL, PTDB, PIXDEF);
   friend int   CntCloseTable(PGLOBAL, PTDB, bool, bool);
   friend int   CntIndexInit(PGLOBAL, PTDB, int, bool);
-  friend RCODE CntIndexRead(PGLOBAL, PTDB, OPVAL, const void*, int, bool);
+  friend RCODE CntIndexRead(PGLOBAL, PTDB, OPVAL, const key_range*, bool);
   friend RCODE CntDeleteRow(PGLOBAL, PTDB, bool);
   friend int   CntIndexRange(PGLOBAL, PTDB, const uchar**, uint*,
                              bool*, key_part_map*);

storage/connect/filamzip.cpp

@@ -1404,8 +1404,13 @@ void ZLBFAM::Rewind(void)
   // We must be positioned after the header block
   if (CurBlk >= 0) {   // Nothing to do if no block read yet
     if (!Optimized) {  // If optimized, fseek will be done in ReadBuffer
+			size_t st;
+
       rewind(Stream);
-      fread(Zlenp, sizeof(int), 1, Stream);
+
+			if (!(st = fread(Zlenp, sizeof(int), 1, Stream)) && trace)
+				htrc("fread error %d in Rewind", errno);
+
       fseek(Stream, *Zlenp + sizeof(int), SEEK_SET);
       OldBlk = -1;
       } // endif Optimized