transactd 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c79eae100f0cec327f7c7256987271b359b033e
-  data.tar.gz: b613533af7f33d4b9f402b9d62af82c256ad0481
+  metadata.gz: a3578c2d4a1064ceb3608b8c3b734f876e31b55f
+  data.tar.gz: dfa2ea21477268383d17d6781c9ea77ca4e558c4
 SHA512:
-  metadata.gz: 6f777f66e171ca8b93a880c0815dd5f7452d2ccb69e8e65255298b7d8fba114cdd08280651992afbfe3719950d5dadf3e2403fdc45bc706bb161d359ec17ac8b
-  data.tar.gz: f1a3f062f6522ea6f739f1b4d0c0d72d9170df06d960d60e00baaab0cb5900216561c991d53a4e1d14ff33801b46e5075b9babd1732dbe2ea3ede27ef52cf371
+  metadata.gz: ae426f5b61c1e4753330196b29622a321ad4d76d2e76dfcf4b15e46886804dd0963e9214d1816909884021389849ef3dcb9e472b98cfe6fdfb7164642717eff9
+  data.tar.gz: cec557719b08f7ce2458b08401cdc1ca81282c4e98020e7edd72099d9a01cf33a2a148807c5069d4fbeab60e876c94df3c5b6da5563cb5a0bc97965ac8856ce5

data/build/swig/ruby/tdclrb_wrap.cpp

@@ -12996,23 +12996,33 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_connMgr_slaveStatusName(int argc, VALUE *argv, VALUE self) {
-  uint_td arg1 ;
-  unsigned int val1 ;
-  int ecode1 = 0 ;
+  bzs::db::protocol::tdap::client::connMgr *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  uint_td arg2 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
   _TCHAR *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "uint_td","bzs::db::protocol::tdap::client::connMgr::slaveStatusName", 1, argv[0] ));
+  
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__connMgr, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::connMgr const *","statusvarName", 1, self )); 
+  }
+  arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::connMgr * >(argp1);
+  
+  ecode2 = SWIG_AsVal_unsigned_SS_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uint_td","bzs::db::protocol::tdap::client::connMgr::slaveStatusName", 2, argv[0] ));
   } 
-  arg1 = static_cast< uint_td >(val1);
+  arg2 = static_cast< uint_td >(val2);
   {
     try {
-      result = (_TCHAR *)bzs::db::protocol::tdap::client::connMgr::slaveStatusName(arg1);
+      result = (_TCHAR *)arg1->slaveStatusName(arg2);
     } catch (bzs::rtl::exception& e) {
       static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
       rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
@@ -20977,7 +20987,6 @@ SWIGINTERN VALUE _wrap_nsdatabase_beginSnapshot(int nargs, VALUE *args, VALUE se
   short arg2;
   short val2;
   binlogPos* bpos = new binlogPos();
-  memset(bpos, 0, sizeof(binlogPos));
   int _v;
   void *vptr = 0;
   int res;
@@ -22765,6 +22774,51 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_database_execSql(int argc, VALUE *argv, VALUE self) 
+{
+  bzs::db::protocol::tdap::client::database *arg1 = (bzs::db::protocol::tdap::client::database *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__database, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::database *","execSql", 1, self )); 
+  }
+  arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::database * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","execSql", 2, argv[0] ));
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = (bool)(arg1)->execSql((char const *)arg2);
+    } catch (bzs::rtl::exception& e) {
+      static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
+      rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
+    } catch (std::exception &e) {
+      static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
+      rb_raise(cpp_std_error, e.what());
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
+}
+
 SWIGINTERN VALUE
 _wrap_database_getSqlStringForCreateTable(int argc, VALUE *argv, VALUE self) {
   bzs::db::protocol::tdap::client::database *arg1 = (bzs::db::protocol::tdap::client::database *) 0 ;
@@ -36468,7 +36522,6 @@ SWIGINTERN VALUE _wrap_pooledDbManager_beginSnapshot(int nargs, VALUE *args, VAL
   short arg2;
   short val2;
   binlogPos* bpos = new binlogPos();
-  memset(bpos, 0, sizeof(binlogPos));
   int _v;
   void *vptr = 0;
   int res;
@@ -37709,6 +37762,7 @@ SWIGEXPORT void Init_transactd(void) {
   rb_define_const(mTransactd, "REPL_POSTYPE_NONE", SWIG_From_int(static_cast< int >(REPL_POSTYPE_NONE)));
   rb_define_const(mTransactd, "REPL_POSTYPE_MARIA_GTID", SWIG_From_int(static_cast< int >(REPL_POSTYPE_MARIA_GTID)));
   rb_define_const(mTransactd, "REPL_POSTYPE_POS", SWIG_From_int(static_cast< int >(REPL_POSTYPE_POS)));
+  rb_define_const(mTransactd, "REPL_POSTYPE_GTID", SWIG_From_int(static_cast< int >(REPL_POSTYPE_GTID)));
   rb_define_const(mTransactd, "ROW_LOCK_X", SWIG_From_int(static_cast< int >(ROW_LOCK_X)));
   rb_define_const(mTransactd, "ROW_LOCK_S", SWIG_From_int(static_cast< int >(ROW_LOCK_S)));
   rb_define_const(mTransactd, "SRV_ISO_READ_UNCOMMITED", SWIG_From_int(static_cast< int >(SRV_ISO_READ_UNCOMMITED)));
@@ -38170,10 +38224,10 @@ SWIGEXPORT void Init_transactd(void) {
   rb_define_method(SwigClassConnMgr.klass, "postDisconnectAll", VALUEFUNC(_wrap_connMgr_postDisconnectAll), -1);
   rb_define_method(SwigClassConnMgr.klass, "stat", VALUEFUNC(_wrap_connMgr_stat), -1);
   rb_define_method(SwigClassConnMgr.klass, "db", VALUEFUNC(_wrap_connMgr_db), -1);
+  rb_define_method(SwigClassConnMgr.klass, "slaveStatusName", VALUEFUNC(_wrap_connMgr_slaveStatusName), -1);
   rb_define_singleton_method(SwigClassConnMgr.klass, "removeSystemDb", VALUEFUNC(_wrap_connMgr_removeSystemDb), -1);
   rb_define_singleton_method(SwigClassConnMgr.klass, "sysvarName", VALUEFUNC(_wrap_connMgr_sysvarName), -1);
   rb_define_singleton_method(SwigClassConnMgr.klass, "statusvarName", VALUEFUNC(_wrap_connMgr_statusvarName), -1);
-  rb_define_singleton_method(SwigClassConnMgr.klass, "slaveStatusName", VALUEFUNC(_wrap_connMgr_slaveStatusName), -1);
   rb_define_singleton_method(SwigClassConnMgr.klass, "create", VALUEFUNC(_wrap_connMgr_create), -1);
   rb_define_method(SwigClassConnMgr.klass, "databases", VALUEFUNC(_wrap_connMgr_databases), -1);
   rb_define_method(SwigClassConnMgr.klass, "tables", VALUEFUNC(_wrap_connMgr_tables), -1);
@@ -38418,6 +38472,7 @@ SWIGEXPORT void Init_transactd(void) {
   rb_define_method(SwigClassDatabase.klass, "open", VALUEFUNC(_wrap_database_open), -1);
   rb_define_method(SwigClassDatabase.klass, "clone", VALUEFUNC(_wrap_database_clone), -1);
   rb_define_method(SwigClassDatabase.klass, "createTable", VALUEFUNC(_wrap_database_createTable), -1);
+  rb_define_method(SwigClassDatabase.klass, "execSql", VALUEFUNC(_wrap_database_execSql), -1);
   rb_define_method(SwigClassDatabase.klass, "getSqlStringForCreateTable", VALUEFUNC(_wrap_database_getSqlStringForCreateTable), -1);
   rb_define_method(SwigClassDatabase.klass, "create", VALUEFUNC(_wrap_database_create), -1);
   rb_define_method(SwigClassDatabase.klass, "drop", VALUEFUNC(_wrap_database_drop), -1);

data/build/swig/tdcl.i

@@ -693,7 +693,6 @@ using namespace bzs::db::protocol::tdap::client;
 %extend bzs::db::protocol::tdap::client::nsdatabase {
   binlogPos* beginSnapshot(short bias=CONSISTENT_READ) {
     binlogPos* bpos = new binlogPos();
-    memset(bpos, 0, sizeof(binlogPos));
     if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
       self->beginSnapshot(bias, bpos);
     else

data/build/tdclc/tdclc.cbproj

@@ -62,7 +62,7 @@
         <VerInfo_Locale>1041</VerInfo_Locale>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
         <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
-        <DllSuffix>_3_3</DllSuffix>
+        <DllSuffix>_3_4</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
         <BCC_PCHUsage>None</BCC_PCHUsage>

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,198
- PRODUCTVERSION 3,3,0,198
+ FILEVERSION 3,4,0,203
+ PRODUCTVERSION 3,4,0,203
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "3.3.0.198"
+            VALUE "FileVersion", "3.4.0.203"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.3.0.198"
+            VALUE "ProductVersion", "3.4.0.203"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,198
- PRODUCTVERSION 3,3,0,198
+ FILEVERSION 3,4,0,203
+ PRODUCTVERSION 3,4,0,203
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "3.3.0.198"
+            VALUE "FileVersion", "3.4.0.203"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.3.0.198"
+            VALUE "ProductVersion", "3.4.0.203"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -153,7 +153,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>3</TD_VER_MAJOR>
-        <TD_VER_MINOR>3</TD_VER_MINOR>
+        <TD_VER_MINOR>4</TD_VER_MINOR>
         <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
         <TD_CPU>32</TD_CPU>
     </PropertyGroup>

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,0,198
- PRODUCTVERSION 3,3,0,198
+ FILEVERSION 3,4,0,203
+ PRODUCTVERSION 3,4,0,203
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "3.3.0.198"
+            VALUE "FileVersion", "3.4.0.203"
             VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
-            VALUE "ProductVersion", "3.3.0.198"
+            VALUE "ProductVersion", "3.4.0.203"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/source/bzs/db/engine/mysql/database.cpp

@@ -32,6 +32,10 @@
 
 extern unsigned int g_timestamp_always;
 
+/* implemnts in mysqlProtocol.cpp */
+extern short getBinlogPos(THD* thd, binlogPos* pos, THD* tmpThd, bzs::db::IblobBuffer* bb);
+
+
 namespace bzs
 {
 namespace db
@@ -193,7 +197,7 @@ tableCacheCounter database::tableRef;
 database::database(const char* name, short cid)
     : m_dbname(name), m_thd(createThdForThread()),m_inAutoTransaction(NULL), 
        m_privilege(0xFFFF), m_inTransaction(0), m_inSnapshot(0), m_stat(0),
-       m_usingExclusive(false), m_trnType(0), m_cid(cid)
+       m_usingExclusive(false), m_trnType(0), m_cid(cid), m_inprocessSnapshot(false)
 {
     cp_security_ctx(m_thd)->skip_grants();
     
@@ -494,7 +498,7 @@ table* database::useTable(int index, enum_sql_command cmd, rowLockMode* lck)
     if (tb == NULL)
         THROW_BZS_ERROR_WITH_CODEMSG(STATUS_FILE_NOT_OPENED,
                                      "Invalid table id.");
-    if (tb->m_blobBuffer && tb->blobFields())
+    if (tb->m_blobBuffer && tb->blobFields() && !m_inprocessSnapshot)
         tb->m_blobBuffer->clear();
 
     // Change to shared lock is user tranasction only.
@@ -710,7 +714,7 @@ void database::useAllTables()
     }
 }
 
-bool database::beginSnapshot(enum_tx_isolation iso, binlogPos* bpos, THD* tmpThd)
+bool database::beginSnapshot(enum_tx_isolation iso, binlogPos* bpos, THD* tmpThd, IblobBuffer* bb)
 {
     if (m_inTransaction)
         THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INTRANSACTION, "Transaction is already beginning.");        
@@ -735,9 +739,14 @@ bool database::beginSnapshot(enum_tx_isolation iso, binlogPos* bpos, THD* tmpThd
                 m_stat = STATUS_LOCK_ERROR;
                 return false;
             }
-            m_stat = getBinlogPos(m_thd, bpos, tmpThd);
+            bb->clear();
+            
+            m_stat = getBinlogPos(m_thd, bpos, tmpThd, bb);
+            
             if (m_stat) return false;
-            useAllTables(); // execute scope in safe_commit_lock  
+            m_inprocessSnapshot = true;
+            useAllTables(); // execute scope in safe_commit_lock 
+            m_inprocessSnapshot = false;
         }else
             useAllTables();
     }  

data/source/bzs/db/engine/mysql/database.h

@@ -133,6 +133,7 @@ private:
     int m_usingExclusive;
     short m_trnType;
     short m_cid;
+    bool m_inprocessSnapshot;
     enum_tx_isolation m_iso;
     std::vector<sec_db> m_securityCtxs;
     Security_context* m_backup_sctx;
@@ -183,7 +184,7 @@ public:
         return m_tables;
     }
 
-    bool beginSnapshot(enum_tx_isolation iso, binlogPos* bpos, THD* tmpThd);
+    bool beginSnapshot(enum_tx_isolation iso, binlogPos* bpos, THD* tmpThd, IblobBuffer* bb);
     bool endSnapshot();
     table* openTable(const std::string& name, short mode,
                      const char* ownerName, std::string dbname);

data/source/bzs/db/engine/mysql/mysqlInternal.h

@@ -476,6 +476,7 @@ inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet
 	return store_create_info(thd, table_list, packet, create_info_arg, with_db_name!=0);
 }
 
+#define cp_get_executed_gtids get_executed_gtids
 
 #else //Not MySQL 5.7
 
@@ -614,6 +615,8 @@ inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet
     return store_create_info(thd, table_list, packet, create_info_arg, with_db_name!=0);
 }
 
+#define cp_get_executed_gtids get_logged_gtids
+
 #endif // Not MARIADB_10_1 || MARIADB_10_0
 
 #endif // Not MySQL 5.7

data/source/bzs/db/engine/mysql/mysqlProtocol.cpp

@@ -29,6 +29,7 @@
 
 #if defined(USE_BINLOG_VAR) && (!defined(MARIADB_BASE_VERSION) &&  MYSQL_VERSION_ID > 50600)
 #  include "sql/binlog.h"
+#  include "rpl_gtid.h"
 #endif
 
 //----------------------------------------------------------------------
@@ -47,28 +48,28 @@
 
 class dummyProtocol : public Protocol_mysql
 {
-  THD* m_thd;
+    THD* m_thd;
     Protocol_mysql* m_backup;
     
 public:
 #if defined(MYSQL_5_7)
-  inline dummyProtocol(THD *thd_arg) : Protocol_mysql()
-  {
-    m_thd = thd_arg;
+    inline dummyProtocol(THD *thd_arg) : Protocol_mysql()
+    {
+        m_thd = thd_arg;
         m_backup = m_thd->get_protocol();
-    m_thd->set_protocol(this);
-  }
-  inline virtual ~dummyProtocol()
+        m_thd->set_protocol(this);
+    }
+    inline virtual ~dummyProtocol()
     {
         m_thd->set_protocol(m_backup);    
     }
 #else
-  inline dummyProtocol(THD *thd_arg) : Protocol_mysql(thd_arg)
-  {
-    m_thd = thd_arg;
+    inline dummyProtocol(THD *thd_arg) : Protocol_mysql(thd_arg)
+    {
+        m_thd = thd_arg;
         m_backup = m_thd->protocol;
         m_thd->protocol = this;
-  }
+    }
     inline virtual ~dummyProtocol()
     {
         m_thd->protocol = m_backup;       
@@ -92,7 +93,7 @@ public:
                      const CHARSET_INFO* /*tocs*/){return false;}
 
     virtual bool send_out_parameters(List<Item_param> *sp_params){return false;}
-  virtual Protocol::enum_protocol_type type(void){ return CP_PROTOCOL; };
+    virtual Protocol::enum_protocol_type type(void){ return CP_PROTOCOL; };
 #ifdef MARIADB_BASE_VERSION      //Mariadb 5.5 10.0 10.1
     virtual bool store(MYSQL_TIME *time, int decimals){return false;}
     virtual bool store_time(MYSQL_TIME *time, int decimals){ return false;}
@@ -100,30 +101,30 @@ public:
     virtual bool store_time(MYSQL_TIME *time){return true;};
     virtual bool store(MYSQL_TIME *time){return true;}
     virtual bool store(const char *from, size_t length, 
-        CHARSET_INFO *fromcs, CHARSET_INFO *tocs){return false;}
+    CHARSET_INFO *fromcs, CHARSET_INFO *tocs){return false;}
 #elif defined(MYSQL_5_7) 
-  bool store_decimal(const my_decimal *, uint, uint){ return true; }
-  bool store(Proto_field *){ return true; }
-  void start_row(){}
-  int read_packet(void){ return 0; }
-  int get_command(COM_DATA *, enum_server_command *){ return m_thd->lex->sql_command; }
-  enum_vio_type connection_type(void){ return VIO_TYPE_PLUGIN; }
-  ulong get_client_capabilities(void){ return 0; }
-  bool has_client_capability(unsigned long){ return false; }
-  bool connection_alive(void){ return false; }
-  bool end_row(void){ return false; }
-  void abort_row(void){}
-  void end_partial_result_set(void){}
-  int shutdown(bool){ return 0; }
-  SSL_handle get_ssl(void){ return NULL; }
-  uint get_rw_status(void){ return 0; }
-  bool get_compression(void){ return false; }
-  bool start_result_metadata(uint, uint, const CHARSET_INFO *){ return false; }
-  bool send_field_metadata(Send_field *, const CHARSET_INFO *){ return false; }
-  bool end_result_metadata(void){ return false; }
-  bool send_ok(uint, uint, ulonglong, ulonglong, const char *){ return false; }
-  bool send_eof(uint, uint){ return false; }
-  bool send_error(uint, const char *, const char *){ return false; }
+    bool store_decimal(const my_decimal *, uint, uint){ return true; }
+    bool store(Proto_field *){ return true; }
+    void start_row(){}
+    int read_packet(void){ return 0; }
+    int get_command(COM_DATA *, enum_server_command *){ return m_thd->lex->sql_command; }
+    enum_vio_type connection_type(void){ return VIO_TYPE_PLUGIN; }
+    ulong get_client_capabilities(void){ return 0; }
+    bool has_client_capability(unsigned long){ return false; }
+    bool connection_alive(void){ return false; }
+    bool end_row(void){ return false; }
+    void abort_row(void){}
+    void end_partial_result_set(void){}
+    int shutdown(bool){ return 0; }
+    SSL_handle get_ssl(void){ return NULL; }
+    uint get_rw_status(void){ return 0; }
+    bool get_compression(void){ return false; }
+    bool start_result_metadata(uint, uint, const CHARSET_INFO *){ return false; }
+    bool send_field_metadata(Send_field *, const CHARSET_INFO *){ return false; }
+    bool end_result_metadata(void){ return false; }
+    bool send_ok(uint, uint, ulonglong, ulonglong, const char *){ return false; }
+    bool send_eof(uint, uint){ return false; }
+    bool send_error(uint, const char *, const char *){ return false; }
 #endif
 };
 
@@ -134,10 +135,12 @@ public:
 class masterStatus : public dummyProtocol
 {
     binlogPos* m_bpos;
-    bool m_writed;
+    bzs::db::IblobBuffer* m_bb;
+    int m_index;
+    
 public:
-    inline masterStatus(THD *thd_arg, binlogPos* bpos) : 
-        dummyProtocol(thd_arg), m_bpos(bpos), m_writed(false) {}
+    inline masterStatus(THD *thd_arg, binlogPos* bpos, bzs::db::IblobBuffer* bb) : 
+        dummyProtocol(thd_arg), m_bpos(bpos), m_bb(bb), m_index(0) {}
     bool store_longlong(longlong from, bool unsigned_flag)
     {
         m_bpos->pos = (ulonglong)from;
@@ -148,21 +151,26 @@ public:
 #if (MYSQL_VERSION_ID < 50600 || defined(MARIADB_BASE_VERSION)) // mariadb 5.5 
     bool store(const char *from, size_t length, CHARSET_INFO *cs)
     {
-        if (!m_writed)
-        {
-      strncpy(m_bpos->filename, from, BINLOGNAME_SIZE); 
-            m_writed = true;
-        }
+        if (m_index == 0)
+            strncpy(m_bpos->filename, from, BINLOGNAME_SIZE); 
+        ++m_index;
         return false;
     }
 #else
     bool store(const char *from, size_t length, const CHARSET_INFO *cs)
     {
-        if (!m_writed)
+        if (m_index == 0)
+            strncpy(m_bpos->filename, from, BINLOGNAME_SIZE);
+        else if (m_index == 3)
         {
-      strncpy(m_bpos->filename, from, BINLOGNAME_SIZE);
-            m_writed = true;
+            if (length)
+            {
+                m_bpos->type = REPL_POSTYPE_GTID;
+                m_bb->addBlob((unsigned int)length + 1, 0, (const unsigned char *)from);
+                m_bb->setFieldCount(1);
+            }
         }
+        ++m_index;
         return false;
     }
 #endif
@@ -182,11 +190,11 @@ bool safe_commit_lock::lock()
     if (m_thd)
     {
         MDL_request mdl_request;
-    #if ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
-    mdl_request.init_with_source(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT, __FILE__, __LINE__);
-    #else
-    mdl_request.init(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT);
-    #endif
+        #if ((MYSQL_VERSION_NUM > 50700) && !defined(MARIADB_BASE_VERSION))
+        mdl_request.init_with_source(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT, __FILE__, __LINE__);
+        #else
+        mdl_request.init(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT);
+        #endif
         if (m_thd->mdl_context.acquire_lock(&mdl_request,
                                     m_thd->variables.lock_wait_timeout))
             return false;
@@ -205,14 +213,14 @@ safe_commit_lock::~safe_commit_lock()
 }
 
 
-#ifdef NOTUSE_BINLOG_VAR 
-    inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* tmpThd)
+#ifdef NOTUSE_BINLOG_VAR //Only MySQL 5.6 Windows
+	inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* tmpThd, bzs::db::IblobBuffer* bb)
     {
         short result = 0;
         {
             attachThd(tmpThd);
             copyGrant(tmpThd, currentThd, NULL);
-            masterStatus p(tmpThd, bpos); 
+            masterStatus p(tmpThd, bpos, bb); 
             cp_query_command(tmpThd, "show master status");
             if (tmpThd->is_error())
                 result = tmpThd->cp_get_sql_error();
@@ -223,8 +231,8 @@ safe_commit_lock::~safe_commit_lock()
     }
 #endif
 
-#ifdef USE_BINLOG_GTID
-    inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* /*tmpThd*/)
+#ifdef USE_BINLOG_GTID //MariaDB 10-
+	inline short getBinlogPosInternal(THD* currentThd, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* /*bb*/)
     {
         if (mysql_bin_log.is_open())
         {
@@ -234,9 +242,9 @@ safe_commit_lock::~safe_commit_lock()
             {
                 sprintf_s(bpos->gtid, GTID_SIZE, "%u-%u-%llu", gtid.domain_id, gtid.server_id, gtid.seq_no); 
                 size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
-          strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
-          bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
-          bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+                strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+                bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+                bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
             }
         }
         return 0;
@@ -244,34 +252,57 @@ safe_commit_lock::~safe_commit_lock()
 #endif
 
 #ifdef USE_BINLOG_VAR
+    inline void readGtid(binlogPos* bpos, bzs::db::IblobBuffer* bb)
+    {
+        #if (MYSQL_VERSION_ID > 50600)
+        char p[1024] = { 0 };
+        char* buf = p;
+        global_sid_lock->wrlock();
+        const Gtid_set* gtid_set = gtid_state->cp_get_executed_gtids();
+        int size = gtid_set->get_string_length();
+        if (size)
+        {
+            ++size;
+            if (size > 1024) buf = new char[size];
+            gtid_set->to_string(buf);
+            bpos->type = REPL_POSTYPE_GTID;
+            bb->addBlob((unsigned int)size, 0, (const unsigned char *)buf);
+            bb->setFieldCount(1);
+            if (p != buf) delete[] buf;
+        }
+        global_sid_lock->unlock();
+        #endif
+    }
+
     // Linux MySQL can access to the mysql_bin_log variable
-    inline short getBinlogPosInternal(THD* , binlogPos* bpos, THD* /*tmpThd*/)
+	inline short getBinlogPosInternal(THD*, binlogPos* bpos, THD* /*tmpThd*/, bzs::db::IblobBuffer* bb)
     {
         if (mysql_bin_log.is_open())
         {
-      size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
-      strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
-      bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
-      bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+            size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
+            strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+            bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+            bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
             bpos->type = REPL_POSTYPE_POS;
+            readGtid(bpos, bb);
         }
         return 0;
     }
 #endif //USE_BINLOG_VAR
 
-short getBinlogPos(THD* thd, binlogPos* bpos, THD* tmpThd)
+short getBinlogPos(THD* thd, binlogPos* bpos, THD* tmpThd, bzs::db::IblobBuffer* bb)
 {
     #ifndef NOTUSE_BINLOG_VAR
     safe_mysql_mutex_lock lck(mysql_bin_log.get_log_lock());
     #endif
-    return getBinlogPosInternal(thd, bpos, tmpThd);
+    return getBinlogPosInternal(thd, bpos, tmpThd, bb);
 }
 
 int execSql(THD* thd, const char* sql)
 {
     thd->variables.lock_wait_timeout = OPEN_TABLE_TIMEOUT_SEC;
     thd->clear_error();
-  int result = cp_query_command(thd, (char*)sql);
+    int result = cp_query_command(thd, (char*)sql);
     if (thd->is_error())
         result = thd->cp_get_sql_error();
     cp_lex_clear(thd); // reset values for insert
@@ -349,8 +380,8 @@ public:
 
 int getSlaveStatus(THD* thd, connection::records& recs, bzs::db::IblobBuffer* bb)
 {
-  slaveStatus ss(thd, recs, bb);
-  return execSql(thd, "show slave status");
+    slaveStatus ss(thd, recs, bb);
+    return execSql(thd, "show slave status");
 }
 
 #pragma GCC diagnostic warning "-Woverloaded-virtual"
@@ -396,17 +427,17 @@ bool setGrant(THD* thd, const char* host, const char* user,  const char* db)
 bool copyGrant(THD* thd, THD* thdSrc, const char* db)
 {
     Security_context* sctx = cp_security_ctx(thdSrc);
-  if (sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
+    if (sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
     {
         cp_security_ctx(thd)->skip_grants();
         return true;
     }
-  return setGrant(thd, sctx->cp_priv_host(), sctx->cp_priv_user(), db);
+    return setGrant(thd, sctx->cp_priv_host(), sctx->cp_priv_user(), db);
 }
 
 void setDbName(THD* thd, const char* name)
 {
-  cp_set_db(thd, name);
+    cp_set_db(thd, name);
 }
 
 /*