transactd 3.0.0 → 3.1.0

data/source/bzs/db/protocol/tdap/client/dllmain.cpp

@@ -221,10 +221,12 @@ extern "C" PACKAGE_OSX short_td __STDCALL
         case TD_END_TRANSACTION:
         case TD_BEGIN_TRANSACTION:
         case TD_ABORT_TRANSACTION:
-        case TD_BEGIN_SHAPSHOT:
         case TD_END_SNAPSHOT:
             client_t->req().paramMask = 0;
             break;
+        case TD_BEGIN_SHAPSHOT:
+            client_t->req().paramMask = P_MASK_DATALEN | P_MASK_DATA;
+            break;
         case TD_KEY_FIRST:
         case TD_KEY_LAST:
         case TD_KEY_FIRST_KO:
@@ -273,7 +275,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             if (client_t->req().keyNum == ST_SUB_GETSQL_BY_TABLEDEF)
             {
                 client_t->req().result = 0;
-                client_t->getSqlCreate();
+                client_t->getSqlCreate(CHARSET_UTF8);
                 client_t->cleanup();
                 return client_t->req().result;
             }

data/source/bzs/db/protocol/tdap/client/field.cpp

@@ -867,6 +867,7 @@ void field::storeValueDbl(double value)
 void field::storeValueStrA(const char* data) 
 {
     char* p = (char*)m_ptr + m_fd->pos;
+    m_fds->cv()->setCodePage(mysql::codePage(m_fd->charsetIndex()));
     switch (m_fd->type)
     {
     case ft_string:
@@ -910,6 +911,7 @@ void field::storeValueStrA(const char* data)
 const char* field::readValueStrA() const
 {
     char* data = (char*)m_ptr + m_fd->pos;
+    m_fds->cv()->setCodePage(mysql::codePage(m_fd->charsetIndex()));
     switch (m_fd->type)
     {
     case ft_string:
@@ -957,6 +959,7 @@ const char* field::readValueStrA() const
 void field::storeValueStrW(const WCHAR* data)
 {
     char* p = (char*)m_ptr + m_fd->pos;
+    m_fds->cv()->setCodePage(mysql::codePage(m_fd->charsetIndex()));
     switch (m_fd->type)
     {
     case ft_string:
@@ -1003,6 +1006,7 @@ void field::storeValueStrW(const WCHAR* data)
 const WCHAR* field::readValueStrW() const
 {
     char* data = (char*)m_ptr + m_fd->pos;
+    m_fds->cv()->setCodePage(mysql::codePage(m_fd->charsetIndex()));
     switch (m_fd->type)
     {
     case ft_string:
@@ -1727,6 +1731,7 @@ void field::setFV(const void* data, uint_td size)
     case ft_mywvarbinary:
     case ft_mywvarchar:
     case ft_lstring:
+    case ft_lvar:
     {
         int sizeByte = m_fd->varLenBytes();
         size = std::min<uint_td>((uint_td)(m_fd->len - sizeByte), size);
@@ -1746,15 +1751,6 @@ void field::setFV(const void* data, uint_td size)
         memcpy(p + sizeByte, &data, sizeof(char*));
         break;
     }
-    case ft_lvar:
-    {
-        int sizeByte = 2;
-        size = std::min<uint_td>((uint_td)(m_fd->len - sizeByte), size);
-        memset(p, 0, m_fd->len);
-        memcpy(p, &size, sizeByte);
-        memcpy(p + sizeByte, data, size);
-        break;
-    }
     default:
         size = std::min<uint_td>((uint_td)m_fd->len, size);
         memset(p, 0, m_fd->len);
@@ -2134,6 +2130,7 @@ void* field::getFVbin(uint_td& size) const
     case ft_mywvarbinary:
     case ft_mywvarchar:
     case ft_lstring:
+    case ft_lvar:
     {
         int sizeByte = m_fd->varLenBytes();
         size = 0;
@@ -2155,13 +2152,6 @@ void* field::getFVbin(uint_td& size) const
         }
         return NULL;
     }
-    case ft_lvar:
-    {
-        int sizeByte = 2;
-        size = 0;
-        memcpy(&size, p, sizeByte);
-        return (void*)(p + sizeByte);
-    }
     default:
         size = m_fd->len;
         return (void*)(p);

data/source/bzs/db/protocol/tdap/client/filter.h

@@ -571,6 +571,8 @@ class filter
     uchar_td* m_buftmp;
 
     int m_extendBuflen;
+    int m_limitRows;
+    int m_readedRows;
     short m_stat;
     ushort_td m_preparedId;
     table::eFindType m_direction;
@@ -638,8 +640,8 @@ class filter
             m_selectFieldIndexes.push_back(fieldNum);
             bsize.select += r.size();
             bsize.retRowSize += r.len;
-
-            if (m_tb->tableDef()->fieldDefs[fieldNum].isNullable())
+            const fielddef& fd = m_tb->tableDef()->fieldDefs[fieldNum];
+            if (fd.nullbytes() && fd.isNullable())
             {
                 ++bsize.nullfields;
                 bsize.nullbytes = (bsize.nullfields + 7) / 8;
@@ -838,7 +840,9 @@ class filter
         m_withBookmark = q->isBookmarkAlso();
         m_cachedOptimize = q->getOptimize();
         m_stopAtLimit = q->isStopAtLimit();
-        m_seekByBookmarks = q->isSeekByBookmarks(); 
+        m_limitRows = m_stopAtLimit ? q->getLimit() : 0;
+        m_readedRows = 0;
+        m_seekByBookmarks = q->isSeekByBookmarks();
 
         if (q->isAll())
             addAllFields();
@@ -958,7 +962,9 @@ class filter
                 m_ret.maxRows =
                     (unsigned short)std::min<int>(calcMaxResultRows(), USHRT_MAX);
             else if (resultBufferNeedSize() > maxDataBuffer())
-                m_ret.maxRows = calcMaxResultRows(); 
+                m_ret.maxRows = calcMaxResultRows();
+            if (m_stopAtLimit && (m_limitRows - m_readedRows < m_ret.maxRows))
+                 m_ret.maxRows = m_limitRows - m_readedRows;
         }
     
         return len;
@@ -974,7 +980,6 @@ class filter
         return true;
     }
 
-
     int doWriteBuffer()
     {
 #ifdef _DEBUG
@@ -1016,10 +1021,11 @@ class filter
     
 
     filter(table* tb)
-        : m_tb(tb), m_seeksWritedCount(0), m_extendBuflen(0), m_stat(0),
-          m_preparedId(0),m_ignoreFields(false), m_seeksMode(false),
-          m_useOptimize(true),m_withBookmark(true), m_hasManyJoin(false),
-          m_preparingMode(false),m_ddba(false),m_stopAtLimit(false)
+        : m_tb(tb), m_seeksWritedCount(0), m_extendBuflen(0),
+          m_limitRows(0), m_readedRows(0), m_stat(0),
+          m_preparedId(0), m_ignoreFields(false), m_seeksMode(false),
+          m_useOptimize(true), m_withBookmark(true), m_hasManyJoin(false),
+          m_preparingMode(false), m_ddba(false), m_stopAtLimit(false)
     {
         m_isTransactd = m_tb->isUseTransactd();
         m_ddba = m_isTransactd;
@@ -1045,6 +1051,8 @@ public:
         m_preparingMode = false;
         m_preparedId = 0;
         m_stat = 0;
+        m_limitRows = 0;
+        m_readedRows = 0;
         bsize.clear();
     }
 
@@ -1345,6 +1353,17 @@ public:
 
     bool withBookmark() const { return m_withBookmark; }
 
+    bool isReadLimit(int readed)
+    {
+        if (m_stopAtLimit)
+        {
+            m_readedRows += readed;
+            return (m_limitRows - m_readedRows <= 0);
+        }
+        return false;
+    }
+    void resetReaded() { m_readedRows = 0;}
+
     static filter* create(table* tb)
     {
         return new filter(tb);

data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp

@@ -1,5 +1,5 @@
 /* =================================================================
- Copyright (C) 2000-2013 BizStation Corp All rights reserved.
+ Copyright (C) 2000-2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -546,6 +546,7 @@ bool nsdatabase::findTable(nstable* tb)
 void nsdatabase::reset()
 {
     int i;
+    resetSnapshot();
 
     if (m_nsimpl->tranCount)
     {
@@ -592,11 +593,21 @@ void nsdatabase::reset()
         m_btrcallid = getBtrvEntryPoint();
 }
 
-void nsdatabase::beginSnapshot(short bias)
+void nsdatabase::resetSnapshot()
+{
+    if (m_nsimpl->snapShotCount)
+    {
+        m_nsimpl->snapShotCount = 1;
+        endSnapshot();
+    }
+}
+
+void nsdatabase::beginSnapshot(short bias, binlogPos* bpos)
 {
     if (m_nsimpl->snapShotCount == 0)
     {
-        m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, NULL, NULL, NULL, 0, 0,
+        uint_td datalen = (bias == CONSISTENT_READ_WITH_BINLOG_POS) ? sizeof(binlogPos) : 0;
+        m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, bpos, &datalen, NULL, 0, 0,
                              m_nsimpl->cidPtr);
 #ifdef TEST_RECONNECT
         if (canRecoverNetError(m_stat))
@@ -780,7 +791,6 @@ bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
         m_stat = 0;
         if (_tcsstr(URI, _T("://")) == NULL)
             return true;
-
     }
     uint_td datalen = 0;
 

data/source/bzs/db/protocol/tdap/client/nsDatabase.h

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_CLIENT_NSDATABASE_H
 #define BZS_DB_PROTOCOL_TDAP_CLIENT_NSDATABASE_H
 /* =================================================================
- Copyright (C) 2000-2013 BizStation Corp All rights reserved.
+ Copyright (C) 2000-2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -52,6 +52,23 @@ DLLLIB void setTrnsctdEntryPoint(BTRCALLID_PTR p);
 DLLLIB BTRCALLID_PTR getTrnsctdEntryPoint();
 /** @endcond */
 
+
+#pragma pack(push, 1)
+pragma_pack1
+#define BINLOGNAME_SIZE 119
+#define GTID_SIZE       64
+struct binlogPos
+{
+    unsigned long long pos;
+    char type;
+    char filename[BINLOGNAME_SIZE];
+    char gtid[GTID_SIZE];
+};
+
+
+#pragma pack(pop)
+pragma_pop
+
 class DLLLIB nsdatabase
 {
     friend class nstable;
@@ -71,6 +88,7 @@ protected:
                                    bool trd);
     virtual bool setUri(const _TCHAR* uri);
     void reset();
+    void resetSnapshot();
     nstable** tables();
     nsdatabase* clone() const;
     nsdatabase& operator=(const nsdatabase&);
@@ -112,7 +130,7 @@ public:
                                NOWAIT_WRITE); // NoWit SingleLock
     void endTrn();
     void abortTrn();
-    void beginSnapshot(short bias = CONSISTENT_READ);
+    void beginSnapshot(short bias = CONSISTENT_READ, binlogPos* bpos=NULL);
     void endSnapshot();
     ushort_td trxIsolationServer() const ;
     ushort_td trxLockWaitTimeoutServer() const ;

data/source/bzs/db/protocol/tdap/client/pooledDatabaseManager.h

@@ -3,7 +3,7 @@
 #define BZS_DB_PROTOCOL_TDAP_CLIENT_POOLEDDATABASEMANAGER_H
 
 /* =================================================================
- Copyright (C) 2014 BizStation Corp All rights reserved.
+ Copyright (C) 2014 2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -165,7 +165,10 @@ public:
 
     inline int enableTrn() { return m_db->enableTrn(); }
 
-    inline void beginSnapshot(short bias = CONSISTENT_READ) { m_db->beginSnapshot(bias); }
+    inline void beginSnapshot(short bias = CONSISTENT_READ, binlogPos* bpos = NULL)
+    {
+        m_db->beginSnapshot(bias, bpos);
+    }
 
     inline void endSnapshot() { m_db->endSnapshot(); }
 

data/source/bzs/db/protocol/tdap/client/recordsetImple.h

@@ -657,13 +657,14 @@ public:
     {
         assert(m_fds->size());
         
-        fielddef fd((*m_fds)[0]);
+        fielddef fd;
         memset(&fd, 0, sizeof(fielddef));
         fd.len = len;
         fd.pos = 0;
         fd.type = type;
         fd.decimals = decimals;
         fd.setName(name);
+        fd.setCharsetIndex((*m_fds)[0].charsetIndex());
         if (blobLenBytes(fd))
             THROW_BZS_ERROR_WITH_MSG(_T("Can not append Blob or Text field."));
         m_fds->push_back(&fd);

data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp

@@ -526,7 +526,7 @@ void makeSuffixNamesList(const tabledef* table, std::vector<std::string>& fds)
     }
 }
 
-std::string sqlBuilder::sqlCreateTable(const char* name /* utf8 */, tabledef* table,
+std::string sqlBuilder::sqlCreateTable(const char* name /* utf8 */, tabledef* td,
                            uchar_td charsetIndexServer, const clsrv_ver* ver)
 {
     // Duplication of a name is inspected and, in duplication, _1 is added.
@@ -534,10 +534,10 @@ std::string sqlBuilder::sqlCreateTable(const char* name /* utf8 */, tabledef* ta
     std::string s = "CREATE TABLE `";
 
     std::vector<std::string> fds;// suffix added names list
-    makeSuffixNamesList(table, fds);
+    makeSuffixNamesList(td, fds);
 
     uint_td schemaCodePage =
-        table->schemaCodePage ? table->schemaCodePage : GetACP();
+        td->schemaCodePage ? td->schemaCodePage : GetACP();
     if ((name && name[0]))
     {
         std::string name2 = name;
@@ -546,14 +546,17 @@ std::string sqlBuilder::sqlCreateTable(const char* name /* utf8 */, tabledef* ta
         s += getFileName(name2.c_str()) + "` (";
     }
     else
-        s += getFileName(table->fileNameA()) + "` (";
-    s += getFieldList(table, fds, ver);
-    insertNisFields(table, fds, s);
-    s += getKeyList(table, fds);
+        s += getFileName(td->fileNameA()) + "` (";
+    s += getFieldList(td, fds, ver);
+    insertNisFields(td, fds, s);
+    s += getKeyList(td, fds);
     if (s[s.size() - 1] == ',')
         s.erase(s.end() - 1);
-    s += ") ENGINE=InnoDB default charset=" +
-         std::string(mysql::charsetName(table->charsetIndex));
+    std::string compress;
+    if (td->flags.bit3)
+        compress = "ROW_FORMAT=COMPRESSED "; 
+    s += ") ENGINE=InnoDB " + compress + "default charset=" + std::string(mysql::charsetName(td->charsetIndex));
+         
 
     // create statement charset must be server default charset.
     // server default charset writen in my.cnf.
@@ -563,20 +566,20 @@ std::string sqlBuilder::sqlCreateTable(const char* name /* utf8 */, tabledef* ta
     return s;
 }
 
-std::string sqlBuilder::sqlCreateIndex(const tabledef* table, int keyNum,
+std::string sqlBuilder::sqlCreateIndex(const tabledef* td, int keyNum,
         bool specifyKeyNum, uchar_td charsetIndexServer, const clsrv_ver* ver)
 {
     std::string s;
     std::vector<std::string> fds;// suffix added names list
-    makeSuffixNamesList(table, fds);
+    makeSuffixNamesList(td, fds);
     uint_td schemaCodePage =
-        table->schemaCodePage ? table->schemaCodePage : GetACP();
-    s += getFieldList(table, fds, ver);
-    insertNisFields(table, fds, s);
+        td->schemaCodePage ? td->schemaCodePage : GetACP();
+    s += getFieldList(td, fds, ver);
+    insertNisFields(td, fds, s);
     s = "`";
-    s+= getFileName(table->fileNameA());
+    s+= getFileName(td->fileNameA());
     s += "` ADD";
-    getKey(table, fds, keyNum, s, specifyKeyNum); 
+    getKey(td, fds, keyNum, s, specifyKeyNum); 
     s.erase(s.end() - 1);
     // create statement charset must be server default charset.
     // server default charset writen in my.cnf.

data/source/bzs/db/protocol/tdap/client/table.cpp

@@ -822,7 +822,7 @@ bool table::isReadContinue(ushort_td& op)
     // limit count control
     if (isContinue)
     {
-        if (filter->isStopAtLimit() && m_impl->rc->rowCount() == filter->maxRows())
+        if (filter->isReadLimit(m_impl->rc->rowCount()))
         {
             m_stat = STATUS_LIMMIT_OF_REJECT;
             return false;
@@ -1181,6 +1181,7 @@ void table::setPrepare(const pq_handle stmt)
     m_impl->resetBookmarks();
     if (m_impl->filterPtr != stmt)
         m_impl->filterPtr = stmt;
+    m_impl->filterPtr->resetReaded();
     if (nsdb()->isReconnected())
         m_impl->filterPtr->setServerPreparedId(0);
 }

data/source/bzs/db/protocol/tdap/client/table.h

@@ -44,7 +44,7 @@ class fields;
 class table;
 /** @endcond */
 
-#if (defined(__BORLANDC__) && !defined(__clang__))
+#if (defined(__BORLANDC__) && !defined(__APPLE__) && !defined(__clang__))
 typedef void __stdcall(* recordCountFn)(table* tb, int count, bool& complate);
 #else
 /** @cond INTERNAL */

data/source/bzs/db/protocol/tdap/client/trdboostapi.h

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_PROTOCOL_TDAP_CLIENT_TRDBOOSTAPI_H
 #define BZS_DB_PROTOCOL_TDAP_CLIENT_TRDBOOSTAPI_H
 /*=================================================================
-   Copyright (C) 2013 2014 BizStation Corp All rights reserved.
+   Copyright (C) 2013-2016 BizStation Corp All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -135,7 +135,7 @@ public:
         m_type = v;
     }
 
-    inline const _TCHAR* uri(bool noPasswd=false) const 
+    inline const _TCHAR* uri() const
     { 
         return m_buf; 
     }
@@ -168,7 +168,7 @@ public:
     virtual void endTrn() = 0;
     virtual void abortTrn() = 0;
     virtual int enableTrn() = 0;
-    virtual void beginSnapshot(short bias = CONSISTENT_READ) = 0;
+    virtual void beginSnapshot(short bias = CONSISTENT_READ, binlogPos* bpos = NULL) = 0;
     virtual void endSnapshot() = 0;
     virtual const _TCHAR* uri() const = 0;
     virtual char_td mode() const = 0;
@@ -844,15 +844,16 @@ inline void connect(Database_Ptr db, const ConnectParam_type& connPrams,
 template <class Database_Ptr>
 inline void createDatabase(Database_Ptr db, const connectParams& connPrams)
 {
-    db->create(connPrams.uri());
+    db->create(connPrams.uri(), connPrams.type());
     if (db->stat())
         throwDbError(db, _T("Create database : "), connPrams.uri());
 }
 
 template <class Database_Ptr>
-inline void createDatabase(Database_Ptr db, const _TCHAR* uri)
+inline void createDatabase(Database_Ptr db, const _TCHAR* uri,
+                                short type = TYPE_SCHEMA_BDF)
 {
-    db->create(uri);
+    db->create(uri, type);
     if (db->stat())
         throwDbError(db, _T("Create database : "), uri);
 }
@@ -885,9 +886,9 @@ inline void connectOpen(Database_Ptr db, const connectParams& connPrams,
     openDatabase(db, connPrams);
 }
 
-template <class Database_Ptr> inline void dropDatabase(Database_Ptr db)
+template <class Database_Ptr> inline void dropDatabase(Database_Ptr db, const _TCHAR* uri=NULL)
 {
-    db->drop();
+    db->drop(uri);
     if (db->stat())
         nstable::throwError(std::_tstring(_T("Drop database ")).c_str(),
                             db->stat());
@@ -1265,7 +1266,10 @@ template <class DB> class snapshot
     DB m_db;
 
 public:
-    snapshot(DB db, short bias = CONSISTENT_READ) : m_db(db) { m_db->beginSnapshot(bias); }
+    snapshot(DB db, short bias = CONSISTENT_READ, binlogPos* bpos=NULL) : m_db(db)
+    {
+        m_db->beginSnapshot(bias, bpos);
+    }
 
     ~snapshot() { m_db->endSnapshot(); }
 };

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

@@ -101,9 +101,10 @@ std::string getDatabaseName(const request& req, bool forSql)
 {
     std::vector<std::string> ssc;
     std::vector<std::string> ss;
-    if (req.keybuf)
+	const char* p = (const char*)req.keybuf;
+	if (p && p[0])
     {
-        std::string s((const char*)req.keybuf);
+		std::string s(p);
         split(ssc, s, "\t");
         if (ssc.size())
         {
@@ -265,7 +266,7 @@ int dbExecuter::errorCode(int ha_error)
     else if (ha_error == HA_ERR_AUTOINC_ERANGE)
         return STATUS_DUPPLICATE_KEYVALUE;
     else if (ha_error == ER_PARSE_ERROR)
-        return STATUS_CANT_CREATE;
+        return STATUS_SQL_PARSE_ERROR;
     else if (ha_error == ER_TABLE_EXISTS_ERROR)
         return STATUS_TABLE_EXISTS_ERROR;
     else if (ha_error == DBM_ERROR_TABLE_USED)
@@ -274,18 +275,25 @@ int dbExecuter::errorCode(int ha_error)
         return ERROR_NO_DATABASE;
     else if(ha_error == ER_NO_SUCH_TABLE)
         return STATUS_TABLE_NOTOPEN;
+    else if(ha_error == ER_SPECIFIC_ACCESS_DENIED_ERROR)
+        return STATUS_ACCESS_DENIED;    
     return MYSQL_ERROR_OFFSET + ha_error;
 }
 
 bool isMetaDb(const request& req)
 {
     char buf[MAX_PATH];
-    strncpy(buf, (char*)req.keybuf, MAX_PATH);
-    _strlwr(buf);
-    char_m* st = _mbsstr((char_m*)buf, (char_m*)BdfNameTitle);
-    if (st == NULL)
-        st = (char_m*)strstr(buf, TRANSACTD_SCHEMANAME);
-    return (st != NULL);
+	const char* p = (const char*)req.keybuf;
+	char_m* st = NULL;
+	if (p && p[0])
+	{
+		strncpy(buf, p, MAX_PATH);
+		_strlwr(buf);
+		st = _mbsstr((char_m*)buf, (char_m*)BdfNameTitle);
+		if (st == NULL)
+			st = (char_m*)strstr(buf, TRANSACTD_SCHEMANAME);
+	}
+	return (st != NULL);
 }
 
 inline bool getUserPasswd(request& req, char* &user, char* &pwd)
@@ -415,7 +423,7 @@ inline bool dbExecuter::doCreateTable(request& req)
             {
                 if (req.result == 0)
                 {
-                    req.result = ddl_dropDataBase(db->thd(), db->name(), dbSqlname);
+					req.result = ddl_dropDataBase(db->thd(), db->name(), dbSqlname, req.cid);
                     if (ER_DB_DROP_EXISTS+ MYSQL_ERROR_OFFSET == req.result) req.result = 0;
                 }
                 return ret;
@@ -1075,7 +1083,7 @@ inline void dbExecuter::doInsertBulk(request& req)
             smartBulkInsert sbi(m_tb, *n);
             for (ushort_td i = 0; i < *n; i++)
             {
-                ushort_td len = *((ushort_td*)pos);
+				ushort_td len = *((ushort_td*)pos);
                 if (pos + len > (const uchar*)req.data + *req.datalen)
                 {
                     ret = STATUS_BUFFERTOOSMALL;
@@ -1149,6 +1157,11 @@ inline enum_tx_isolation getIsolationLevel(int op)
     return ISO_READ_COMMITTED;
 }
 
+inline bool snapshotWithBinlogPos(int op)
+{
+    return (op == CONSISTENT_READ_WITH_BINLOG_POS+TD_BEGIN_SHAPSHOT);
+}
+
 inline short getTrnsactionType(int op)
 {
     op = op % 1000;
@@ -1248,22 +1261,57 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
             doDelete(req);
             break;
         case TD_BEGIN_TRANSACTION:
-            transactionResult =
-                getDatabaseCid(req.cid)->beginTrn(getTrnsactionType(opTrn)
+        {
+            database* db = getDatabaseCid(req.cid);
+            transactionResult = db->beginTrn(getTrnsactionType(opTrn)
                                                     ,getIsolationLevel(opTrn));
+            req.result = errorCodeSht(db->stat());
             break;
+        }
         case TD_END_TRANSACTION:
-            transactionResult = getDatabaseCid(req.cid)->commitTrn();
+        {
+            database* db = getDatabaseCid(req.cid);
+            transactionResult = db->commitTrn();
+            req.result = errorCodeSht(db->stat());
             break;
+        }
         case TD_ABORT_TRANSACTION:
-            transactionResult = getDatabaseCid(req.cid)->abortTrn();
+        {
+            database* db = getDatabaseCid(req.cid);
+            transactionResult = db->abortTrn();
+            req.result = errorCodeSht(db->stat());
             break;
+        }
         case TD_BEGIN_SHAPSHOT:
-            transactionResult = getDatabaseCid(req.cid)->beginSnapshot(getIsolationLevel(opTrn));
+        {
+            bool withSnapshot = snapshotWithBinlogPos(opTrn);
+            if (withSnapshot && *req.datalen < sizeof(binlogPos))
+                req.result = STATUS_BUFFERTOOSMALL;
+            else
+            {
+                binlogPos bpos;
+                memset(&bpos, 0, sizeof(binlogPos));
+                database* db = getDatabaseCid(req.cid);
+                transactionResult = db->beginSnapshot(
+                        getIsolationLevel(opTrn), withSnapshot ? &bpos : NULL);
+                req.result = errorCodeSht(db->stat());
+                if (transactionResult && withSnapshot)
+                {   
+                    // return binlog position for replication.
+                    req.paramMask = P_MASK_STAT;
+                    memcpy(req.data, &bpos, sizeof(binlogPos));
+                    req.resultLen = sizeof(binlogPos);
+                }
+            }
             break;
+        }
         case TD_END_SNAPSHOT:
-            transactionResult = getDatabaseCid(req.cid)->endSnapshot();
+        {
+            database* db = getDatabaseCid(req.cid);
+            transactionResult = db->endSnapshot();
+            req.result = errorCodeSht(db->stat());
             break;
+        }
         case TD_TABLE_INFO: // support recordlen and recordCount only.
             doStat(req);
             break;
@@ -1450,12 +1498,11 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
                 std::string tbname = m_tb->name();
                 m_tb->close();
                 m_tb = NULL;
-                if ((req.keyNum == CR_SUBOP_DROP) && (tbname == TRANSACTD_SCHEMANAME))
+                if (req.keyNum == CR_SUBOP_DROP)
                 {
                     database* db = getDatabaseCid(req.cid);
                     req.result = ddl_dropTable(db, tbname, db->name(), tbname);
                 }
-                
             }
             break;
         case TD_BUILD_INDEX:
@@ -1604,8 +1651,8 @@ int dbExecuter::commandExec(request& req, netsvc::server::netWriter* nw)
         if (transactionResult)
         {
             if ((op == TD_BEGIN_TRANSACTION) || (op == TD_BEGIN_SHAPSHOT))
-                return EXECUTE_RESULT_FORCSE_SYNC;
-            return EXECUTE_RESULT_FORCSE_ASYNC;
+                return EXECUTE_RESULT_FORCSE_SYNC; // this is begin
+            return EXECUTE_RESULT_FORCSE_ASYNC;    // this is end 
         }
         if (req.result == ERROR_TD_INVALID_CLINETHOST)
             return EXECUTE_RESULT_ACCESS_DNIED;