transactd 2.2.0 → 2.3.0

data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp

@@ -37,7 +37,7 @@
 #include <random>
 
 
-extern unsigned int getTransactdIsolation();
+extern int getTransactdIsolation();
 extern unsigned int getTransactdLockWaitTimeout();
 
 namespace bzs
@@ -530,7 +530,8 @@ inline void readAfter(request& req, table* tb, dbExecuter* dbm)
                 req.paramMask |= P_MASK_BLOBBODY;
             req.data = tb->record();
         }
-    }
+    }else if (!tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
     req.result = dbm->errorCodeSht(tb->stat());
 }
 
@@ -610,57 +611,64 @@ inline int dbExecuter::doReadMultiWithSeek(request& req, int op,
     int ret = 1;
     m_tb = getTable(req.pbk->handle);
     char keynum = m_tb->keyNumByMakeOrder(req.keyNum);
-    if (m_tb->setKeyNum(keynum))
+    if (!m_tb->setKeyNum(keynum))
     {
-        m_tb->setKeyValuesPacked((const uchar*)req.keybuf, req.keylen);
-        m_tb->seekKey((op == TD_KEY_GE_NEXT_MULTI) ? HA_READ_KEY_OR_NEXT
-                                                   : HA_READ_KEY_OR_PREV,
-                      m_tb->keymap());
-
-        extRequest* ereq = (extRequest*)req.data;
-        bool noBookmark = (ereq->itype & FILTER_CURRENT_TYPE_NOBOOKMARK) != 0;
-        bool execPrepared = (ereq->itype & FILTER_TYPE_SUPPLYVALUE) != 0;
-        // smartReadRecordsHandler scope
-        {
-            smartReadRecordsHandler srrh(m_readHandler);
+        req.result = m_tb->stat();
+        return ret;
+    }
 
-            if (execPrepared)
-            {
-                if (m_tb->preparedStatements.size() < ereq->preparedId)
-                    req.result = STATUS_INVALID_PREPAREID;
-                else
-                    req.result = m_readHandler->beginPreparExecute(m_tb, ereq, true, nw,
-                                               noBookmark, 
-                                              (prepared*)m_tb->preparedStatements[ereq->preparedId - 1]);
-            }
+    m_tb->setKeyValuesPacked((const uchar*)req.keybuf, req.keylen);
+    m_tb->seekKey((op == TD_KEY_GE_NEXT_MULTI) ? HA_READ_KEY_OR_NEXT
+                                                : HA_READ_KEY_OR_PREV,
+                    m_tb->keymap());
+
+    extRequest* ereq = (extRequest*)req.data;
+    bool noBookmark = (ereq->itype & FILTER_CURRENT_TYPE_NOBOOKMARK) != 0;
+    bool execPrepared = (ereq->itype & FILTER_TYPE_SUPPLYVALUE) != 0;
+    // smartReadRecordsHandler scope
+    {
+        smartReadRecordsHandler srrh(m_readHandler);
+
+        if (execPrepared)
+        {
+            if (m_tb->preparedStatements.size() < ereq->preparedId)
+                req.result = STATUS_INVALID_PREPAREID;
             else
-                req.result = m_readHandler->begin(m_tb, ereq, true, nw,
-                                              (op == TD_KEY_GE_NEXT_MULTI),
-                                              noBookmark);
-            if (req.result != 0)
-                return ret;
-            if (m_tb->stat() == 0)
-            {
-                if (op == TD_KEY_GE_NEXT_MULTI)
-                    m_tb->getNextExt(m_readHandler, true, noBookmark);
-                else if (op == TD_KEY_LE_PREV_MULTI)
-                    m_tb->getPrevExt(m_readHandler, true, noBookmark);
-            }
-            req.result = errorCodeSht(m_tb->stat());
-            DEBUG_WRITELOG2(op, req);
+                req.result = m_readHandler->beginPreparExecute(m_tb, ereq, true, nw,
+                                            noBookmark, 
+                                            (prepared*)m_tb->preparedStatements[ereq->preparedId - 1]);
         }
-        short dummy = 0;
-        size_t& size = nw->datalen;
-        size = req.serializeForExt(m_tb, nw);
-        char* resultBuffer = nw->ptr();
-        netsvc::server::buffers* optionalData = nw->optionalData();
-        if ((req.paramMask & P_MASK_BLOBBODY) && m_blobBuffer->fieldCount())
-            size = req.serializeBlobBody(m_blobBuffer, resultBuffer, size,
-                                         FILE_MAP_SIZE, optionalData, dummy);
-
-        DEBUG_PROFILE_END_OP(1, op)
-        ret = EXECUTE_RESULT_SUCCESS;
+        else
+            req.result = m_readHandler->begin(m_tb, ereq, true, nw,
+                                            (op == TD_KEY_GE_NEXT_MULTI),
+                                            noBookmark);
+        if (req.result != 0)
+            return ret;
+        if (m_tb->stat() == 0)
+        {
+            if (op == TD_KEY_GE_NEXT_MULTI)
+                m_tb->getNextExt(m_readHandler, true, noBookmark);
+            else if (op == TD_KEY_LE_PREV_MULTI)
+                m_tb->getPrevExt(m_readHandler, true, noBookmark);
+        }
+        req.result = errorCodeSht(m_tb->stat());
+        if (!m_tb->cursor())
+            req.paramMask |= P_MASK_PB_ERASE_BM;
+        DEBUG_WRITELOG2(op, req);
     }
+    short dummy = 0;
+    size_t& size = nw->datalen;
+    size = req.serializeForExt(m_tb, nw);
+    char* resultBuffer = nw->ptr();
+    netsvc::server::buffers* optionalData = nw->optionalData();
+    if ((req.paramMask & P_MASK_BLOBBODY) && m_blobBuffer->fieldCount())
+        size = req.serializeBlobBody(m_blobBuffer, resultBuffer, size,
+                                        FILE_MAP_SIZE, optionalData, dummy);
+
+    DEBUG_PROFILE_END_OP(1, op)
+    ret = EXECUTE_RESULT_SUCCESS;
+
+        
     if (m_tb)
         m_tb->unUse();
     return ret;
@@ -682,7 +690,10 @@ inline int dbExecuter::doReadMulti(request& req, int op,
     {
         char keynum = m_tb->keyNumByMakeOrder(req.keyNum);
         if (!m_tb->setKeyNum(keynum))
+        {
+            req.result = m_tb->stat();
             return ret;
+        }
     }
     // smartReadRecordsHandler scope
     {
@@ -716,6 +727,8 @@ inline int dbExecuter::doReadMulti(request& req, int op,
                 m_tb->stepPrevExt(m_readHandler, incCurrent, noBookmark);
             req.result = errorCodeSht(m_tb->stat());
         }
+        if (!m_tb->cursor())
+            req.paramMask |= P_MASK_PB_ERASE_BM;
         DEBUG_WRITELOG2(op, req);
     }
 
@@ -859,13 +872,18 @@ inline void dbExecuter::doInsert(request& req)
                               req.blobHeader);
     __int64 aincValue = m_tb->insert(ncc);
     req.result = errorCodeSht(m_tb->stat());
-    if (aincValue)
+    if (m_tb->stat() == 0)
     {
-        req.paramMask = P_MASK_INS_AUTOINC;
-        req.data = m_tb->record();
+        if (aincValue)
+        {
+            req.paramMask = P_MASK_INS_AUTOINC;
+            req.data = m_tb->record();
+        }
+        else
+            req.paramMask = P_MASK_POSBLK | P_MASK_KEYBUF;
     }
-    else
-        req.paramMask = P_MASK_POSBLK | P_MASK_KEYBUF;
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 inline void dbExecuter::doUpdateKey(request& req)
@@ -889,6 +907,8 @@ inline void dbExecuter::doUpdateKey(request& req)
     }
     req.result = errorCodeSht(m_tb->stat());
     req.paramMask = P_MASK_POSBLK | P_MASK_KEYBUF;
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 inline void dbExecuter::doUpdate(request& req)
@@ -904,6 +924,8 @@ inline void dbExecuter::doUpdate(request& req)
     }
     req.result = errorCodeSht(m_tb->stat());
     req.paramMask = P_MASK_POSBLK | P_MASK_KEYBUF;
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 inline void dbExecuter::doDeleteKey(request& req)
@@ -923,6 +945,8 @@ inline void dbExecuter::doDeleteKey(request& req)
     }
     req.result = errorCodeSht(m_tb->stat());
     req.paramMask = P_MASK_POSBLK;
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 inline void dbExecuter::doDelete(request& req)
@@ -933,6 +957,8 @@ inline void dbExecuter::doDelete(request& req)
         m_tb->del();
     req.result = errorCodeSht(m_tb->stat());
     req.paramMask = P_MASK_POSBLK;
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 inline void dbExecuter::doInsertBulk(request& req)
@@ -981,6 +1007,8 @@ inline void dbExecuter::doInsertBulk(request& req)
     }
     else
         req.result = errorCodeSht(m_tb->stat());
+    if (!m_tb->cursor())
+        req.paramMask |= P_MASK_PB_ERASE_BM;
 }
 
 /**
@@ -1004,6 +1032,7 @@ inline void dbExecuter::doStat(request& req)
         memcpy((char*)req.data, &len, sizeof(ushort_td));
         uint rows = (uint)m_tb->recordCount((req.keyNum != 0));
         memcpy((char*)req.data + 6, &rows, sizeof(uint));
+		req.result = errorCodeSht(m_tb->stat());
     }
     else
         req.result = STATUS_BUFFERTOOSMALL;
@@ -1072,7 +1101,10 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
         {
           if (op != TD_CONNECT && op != TD_CREATETABLE &&
               op != TD_OPENTABLE && op != TD_GETSERVER_CHARSET)
+          {
+              req.result = STATUS_ACCESS_DENIED;
               return EXECUTE_RESULT_ACCESS_DNIED;
+          }
         }
         switch (op)
         {
@@ -1150,14 +1182,39 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             req.data = (void*)m_tb->position();
             req.resultLen = m_tb->posPtrLen();
             break;
+        case TD_RECONNECT:
+
+            if (!doOpenTable(req))
+            {
+                req.result = ERROR_TD_INVALID_CLINETHOST;
+                break;
+            }
+            {
+                char* p = (char*)req.data;
+                req.keyNum = *p;
+                if (*(++p) == 0)
+                    break;
+                req.data = ((char*)req.data) + 2;
+                if (m_tb) m_tb->unUse();
+            }
+            //fall through  restore position 
         case TD_MOVE_BOOKMARK:
         {
             rowLockMode lck;
             getRowLockMode(opTrn, &lck);
             m_tb = getTable(req.pbk->handle, lck.lock ? SQLCOM_UPDATE : SQLCOM_SELECT);
             m_tb->setRowLock(&lck);
-            m_tb->movePos((uchar*)req.data,
-                          m_tb->keyNumByMakeOrder(req.keyNum));
+            char keynum = req.keyNum;
+            if (keynum != -1)
+            {
+                keynum = m_tb->keyNumByMakeOrder(req.keyNum);
+                if (!m_tb->keynumCheck(keynum))
+                {
+                    req.result = STATUS_INVALID_KEYNUM;
+                    break;
+                }
+            }
+            m_tb->movePos((uchar*)req.data, keynum);
             if (lck.lock && m_tb->stat())
                 m_tb->setRowLockError();
             readAfter(req, m_tb, this);
@@ -1170,7 +1227,8 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             {
                 m_tb = NULL;
                 return EXECUTE_RESULT_SUCCESS;
-            }
+            }else
+                resultBuffer = nw->ptr();
             break;
         case TD_KEY_SEEK_MULTI:
         case TD_KEY_NEXT_MULTI:
@@ -1182,7 +1240,8 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             {
                 m_tb = NULL;
                 return EXECUTE_RESULT_SUCCESS;
-            }
+            }else
+                resultBuffer = nw->ptr();
             break;
         case TD_FILTER_PREPARE:
             m_tb = getTable(req.pbk->handle);
@@ -1207,7 +1266,8 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
                     *((unsigned short*)req.data) = (unsigned short)m_tb->preparedStatements.size();
                     req.resultLen = 2;
                 }
-            }
+            }else
+                req.result = m_tb->stat();
             break;
         case TD_MOVE_PER:
             m_tb = getTable(req.pbk->handle);
@@ -1221,7 +1281,7 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             req.result = errorCodeSht(m_tb->stat());
             if (m_tb->stat() == 0)
             {
-                req.paramMask = P_MASK_DATA | P_MASK_DATALEN;
+                req.paramMask = P_MASK_DATA | P_MASK_DATALEN ;
                 req.data = m_tb->percentResult();
                 req.resultLen = sizeof(int);
             }
@@ -1252,6 +1312,7 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
                 req.result = SERVER_CLIENT_NOT_COMPATIBLE;
             break;
         }
+        
         case TD_CONNECT:
             if (!connect(req))
                 req.result = ERROR_TD_INVALID_CLINETHOST;
@@ -1349,13 +1410,11 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             req.result = getDatabaseCid(req.cid)->aclReload();
             break;
         }
-        if (m_tb)
-            m_tb->unUse();
         DEBUG_WRITELOG2(op, req)
         DEBUG_ERROR_MEMDUMP(req.result, "error", req.m_readBuffer, *((unsigned int*)req.m_readBuffer))
-           
-
         size = req.serialize(m_tb, resultBuffer);
+        if (m_tb)
+            m_tb->unUse();
         short dymmy = 0;
         if ((req.result == 0) && (req.paramMask & P_MASK_BLOBBODY) &&
             m_blobBuffer->fieldCount())
@@ -1395,13 +1454,17 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
 
     catch (...)
     {
-        clenupNoException();
-        DEBUG_ERROR_MEMDUMP(20001, "error", req.m_readBuffer, *((unsigned int*)req.m_readBuffer))
-        req.reset();
-        req.result = 20001;
-        dumpStdErr(op, req, m_tb);
         try
         {
+            try
+            {
+                clenupNoException();
+                DEBUG_ERROR_MEMDUMP(20001, "error", req.m_readBuffer, *((unsigned int*)req.m_readBuffer))
+                req.reset();
+                req.result = 20001;
+                dumpStdErr(op, req, m_tb);
+            }
+            catch(...){}
             if (m_tb)
                 m_tb->close();
         }
@@ -1442,7 +1505,7 @@ size_t dbExecuter::getAcceptMessage(char* message, size_t size)
     ver->srvMajor = TRANSACTD_VER_MAJOR;
     ver->srvMinor = TRANSACTD_VER_MINOR;
     ver->srvRelease = TRANSACTD_VER_RELEASE;
-    hst->transaction_isolation = getTransactdIsolation();
+    hst->transaction_isolation = (unsigned short)getTransactdIsolation();
     hst->lock_wait_timeout = getTransactdLockWaitTimeout();
     if (strcmp(g_auth_type, AUTH_TYPE_MYSQL_STR) == 0)
     {

data/source/bzs/db/protocol/tdap/tdapRequest.h

@@ -51,12 +51,18 @@ namespace client {class table;}
 #define P_MASK_DATALEN 4
 #define P_MASK_KEYBUF 8
 #define P_MASK_KEYNUM 16
-#define P_MASK_EX_SENDLEN                                                      \
-    32 //< The data length which transmits to a client is described at 2 bytes
-// of the data buffer head.
+
+/** The data length which transmits to a client 
+ *  is described at 2 bytes of the data buffer head.
+ */
+#define P_MASK_EX_SENDLEN 32    
 #define P_MASK_BLOBBODY 64
-#define P_MASK_FINALRET 128 // server sent final result
+#define P_MASK_FINALRET 128     // server sent final result
 #define P_MASK_FINALDATALEN 256 // server sent final result
+#define P_MASK_PB_BOOKMARK 512  // posblk bookmark writen
+#define P_MASK_PB_ERASE_BM 1024 // posblk bookmark erase command
+#define P_MASK_PB_LOCKED   2048 // posblk row locked
+
 
 #define P_MASK_ALL                                                             \
     P_MASK_POSBLK | P_MASK_DATA | P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM
@@ -101,6 +107,9 @@ struct version
     uchar_td Type;
 };
 
+#pragma pack(push, 1)
+pragma_pack1;
+
 struct posblk
 {
     posblk() { memset(this, 0, sizeof(posblk)); }
@@ -108,7 +117,12 @@ struct posblk
     unsigned int handle;
     client::table* tb;
     DDBA_PTR allocFunc;
+    unsigned char lock;
+    unsigned char bookmarkLen;
+    char bookmark[1]; //dummy array
 };
+#pragma pack(pop)
+pragma_pop;
 
 struct clientID
 {

data/source/bzs/db/protocol/tdap/tdapSchema.cpp

@@ -307,18 +307,17 @@ unsigned int fielddef::charNum(/* int index */) const
 
 ushort_td lenByCharnum(uchar_td type, uchar_td charsetIndex, ushort_td charnum)
 {
-    ushort_td len;
-    if (charsetIndex && ((type == ft_mychar) || (type == ft_mywchar) ||
-                         (type == ft_myvarchar) || (type == ft_mywvarchar)))
-    {
+    ushort_td len = charnum;
+    if ((type == ft_wstring) || (type == ft_wzstring) || (type == ft_mywchar) ||
+                    (type == ft_mywvarchar)|| (type == ft_mywvarbinary))
+        len = (ushort_td)(mysql::charsize(CHARSET_UTF16LE) * charnum);
+    else if (charsetIndex && ((type == ft_mychar) || (type == ft_myvarchar)|| 
+            (type == ft_string) || (type == ft_zstring)|| (type == ft_myvarbinary) ))
         len = (ushort_td)(mysql::charsize(charsetIndex) * charnum);
-        if ((type == ft_myvarchar) || (type == ft_mywvarchar))
-            len += ((len >= 256) ? 2 : 1);
-        else
-            len = std::min<ushort_td>(len, 255);
-    }
+    if ((type == ft_myvarchar) || (type == ft_mywvarchar) || (type == ft_myvarbinary) || (type == ft_mywvarbinary))
+        len += ((len >= 256) ? 2 : 1);
     else
-        len = charnum;
+        len = std::min<ushort_td>(len, 255);
     return len;
 }
 
@@ -512,25 +511,36 @@ PACKAGE uchar_td getFilterLogicTypeCode(const _TCHAR* cmpstr)
 {
     if (_tcscmp(cmpstr, _T("=")) == 0)
         return (uchar_td)eEqual;
-
-    if (_tcscmp(cmpstr, _T(">")) == 0)
+    else if (_tcscmp(cmpstr, _T(">")) == 0)
         return (uchar_td)eGreater;
-
-    if (_tcscmp(cmpstr, _T("<")) == 0)
+    else if (_tcscmp(cmpstr, _T("<")) == 0)
         return (uchar_td)eLess;
-
-    if (_tcscmp(cmpstr, _T("<>")) == 0)
+    else if (_tcscmp(cmpstr, _T("<>")) == 0)
         return (uchar_td)eNotEq;
-
-    if (_tcscmp(cmpstr, _T("=>")) == 0)
+    else if (_tcscmp(cmpstr, _T("=>")) == 0)
         return (uchar_td)eGreaterEq;
-    if (_tcscmp(cmpstr, _T(">=")) == 0)
+    else if (_tcscmp(cmpstr, _T(">=")) == 0)
         return (uchar_td)eGreaterEq;
-
-    if (_tcscmp(cmpstr, _T("=<")) == 0)
+    else if (_tcscmp(cmpstr, _T("=<")) == 0)
         return (uchar_td)eLessEq;
-    if (_tcscmp(cmpstr, _T("<=")) == 0)
+    else if (_tcscmp(cmpstr, _T("<=")) == 0)
         return (uchar_td)eLessEq;
+    else if (_tcscmp(cmpstr, _T("=i")) == 0)
+        return (uchar_td)eEqual | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T(">i")) == 0)
+        return (uchar_td)eGreater | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T("<i")) == 0)
+        return (uchar_td)eLess | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T("<>i")) == 0)
+        return (uchar_td)eNotEq | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T("=>i")) == 0)
+        return (uchar_td)eGreaterEq | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T(">=i")) == 0)
+        return (uchar_td)eGreaterEq | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T("=<i")) == 0)
+        return (uchar_td)eLessEq | CMPLOGICAL_CASEINSENSITIVE;
+    else if (_tcscmp(cmpstr, _T("<=i")) == 0)
+        return (uchar_td)eLessEq | CMPLOGICAL_CASEINSENSITIVE;
     return 255;
 }
 

data/source/bzs/db/protocol/tdap/tdapSchema.h

@@ -184,6 +184,12 @@ PACKAGE ushort_td
 /* Is field type string ? */
 PACKAGE bool isStringType(uchar_td type);
 
+/** @cond INTERNAL */
+#define PAD_CHAR_OPTION_SAVED   1
+#define USE_PAD_CHAR            2
+#define TRIM_PAD_CHAR           4
+/** @endcond */
+
 /* Mark of ** that BizStation Corp internal use only.
  */
 template <int N> struct fielddef_t
@@ -225,13 +231,13 @@ public:
 
 protected:
     uchar_td m_charsetIndex; // charctor set index of this field data
-    uint_td m_schemaCodePage;
-
+    ushort_td m_schemaCodePage;
+    ushort_td m_padCharOptions;
 public:
     FLAGS enableFlags; // ** enable flags. see below
 
 private:
-    inline void setSchemaCodePage(uint_td v) { m_schemaCodePage = v; };
+    inline void setSchemaCodePage(uint_td v) { m_schemaCodePage = (ushort_td)v; };
     friend class client::dbdef;
 };
 
@@ -370,6 +376,8 @@ public:
         if (((type >= ft_myvarchar) && (type <= ft_mywvarbinary)) ||
             type == ft_lstring)
             return len < 256 ? 1 : 2;
+        else if (type == ft_lvar)
+            return 2;
         return 0;
     }
 
@@ -450,6 +458,33 @@ public:
         return dataLen(ptr);
     }
 
+	inline void setPadCharSettings(bool set, bool trim)
+    {
+        m_padCharOptions = 0;
+        m_padCharOptions |= PAD_CHAR_OPTION_SAVED;
+        if ((type == ft_mychar) || (type == ft_mywchar))
+        {
+            m_padCharOptions |= USE_PAD_CHAR;
+            if (trim)
+                m_padCharOptions |= TRIM_PAD_CHAR;
+        }    // For compatibility with conventional.
+        else if ((type == ft_string) || (type == ft_wstring))
+        {
+             if (set)
+                m_padCharOptions |= USE_PAD_CHAR;
+             if (trim)
+                m_padCharOptions |= TRIM_PAD_CHAR;
+        }
+    }
+	
+	/* When ft_string or ft_wstring, fill by pad char at write. */
+    bool usePadChar() const {return (m_padCharOptions & USE_PAD_CHAR) == USE_PAD_CHAR;}
+
+    /* When ft_string or ft_wstring or ft_mychar or  ft_mywchar,
+       remove pad char at read.*/
+    bool trimPadChar() const {return (m_padCharOptions & TRIM_PAD_CHAR) == TRIM_PAD_CHAR;}
+
+
 /** @cond INTERNAL */
     /* copy key data for send to mysql
      *  return next copy address.
@@ -534,6 +569,12 @@ public:
         return *data + size;
     }
 
+    /* copy blob data for recordset 
+
+      @param blobBlock copy to adddres
+      @return new copy to address
+        
+    */
     inline  unsigned char* setBlobFieldPointer(uchar_td* dest, const blobHeader* hd,
                                     unsigned char* blobBlock, int fieldNum) const
     {
@@ -552,6 +593,30 @@ public:
             ++hd->curRow;
         return blobBlock + size;
     }
+
+    inline void setPadCharDefaultSettings()
+    {
+        if (!padCharOptionSaved())
+        {
+            // For compatibility with conventional.
+            if ((type == ft_string) || (type == ft_wstring) ||
+                (type == ft_mychar) || (type == ft_mywchar))
+            {
+                m_padCharOptions |= USE_PAD_CHAR;
+                m_padCharOptions |= TRIM_PAD_CHAR;
+            }
+        }
+        else if ((type == ft_mychar) || (type == ft_mywchar))
+            m_padCharOptions |= USE_PAD_CHAR;
+    }
+
+    /* PadChar options are saved at schema.
+        This is for compatibility with conventional.*/
+    bool padCharOptionSaved() const
+    {
+        return (m_padCharOptions & PAD_CHAR_OPTION_SAVED) == PAD_CHAR_OPTION_SAVED;
+    }
+
 /** @endcond */
 };
 
@@ -667,7 +732,7 @@ public:
     int autoIncExSpace;
     uchar_td iconIndex2;
     uchar_td iconIndex3;
-    uint_td schemaCodePage; // Code page of this schema stirng data.
+    uint_td schemaCodePage; // Code page of this schema string data.
 
 private:
     char formatVersion;

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -144,6 +144,7 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define TD_STASTISTICS                  94
 #define TD_KEY_SEEK_MULTI               95
 #define TD_ACL_RELOAD                   96
+#define TD_RECONNECT                    97
 
 /** create sub operations
  */
@@ -173,8 +174,8 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define LG_SUBOP_CONNECT                0
 #define LG_SUBOP_DISCONNECT             1
 #define LG_SUBOP_NEWCONNECT             3
-
-
+#define LG_SUBOP_RECONNECT              4 
+#define LG_SUBOP_DISCONNECT_EX          5 //for reconnect test
 /** field types
  */
 #define ft_string                       0
@@ -386,6 +387,13 @@ typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
 #define ERROR_TD_HOSTNAME_NOT_FOUND     3103
 #define ERROR_TD_CONNECTION_FAILURE     3106
 #define ERROR_TD_NOT_CONNECTED          3110
+#define ERROR_TD_NET_TIMEOUT            3800
+#define ERROR_TD_NET_REMOTE_DISCONNECT  3801
+#define ERROR_TD_NET_TOO_BIGDATA        3802
+#define ERROR_TD_NET_OTHER              3810
+#define ERROR_TD_C_CLIENT_UNKNOWN       3811
+#define ERROR_TD_RECONNECTED            3900
+
 
 #define TRANSACTD_SCHEMANAME            _T("transactd_schema")
 #define TYPE_SCHEMA_BDF                 0
@@ -451,7 +459,7 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "2"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "2"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "3"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -515,7 +523,7 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "2"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "3"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -532,7 +540,7 @@ struct handshale_t
 #endif
 
 #define TRANSACTD_VER_MAJOR 2//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 2//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 3//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H