transactd 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e98201915050eedaa0ae874f15180ea86cecbc
-  data.tar.gz: e916f4dfa349ca4b38cac35b4f753130a28dcb52
+  metadata.gz: e43c70f7ba625145762a498772fa4b02ba02e150
+  data.tar.gz: 71c277ba399849a65d6310d59ba37bad75325ce2
 SHA512:
-  metadata.gz: 295ccc792e04520ee372a6cc0f363eb5cd15179d30272d32de727856468f66f713b178847aab0c341d463861f552a29cfc51a64bba7f9430de1449679c43b4a1
-  data.tar.gz: e933424f24905e6bba017269cd3680656b2b5e0167b7d3f1a994f9089f3948e46441b42d1f75cac8fef90ff38d2784d36f2e0a7483de1485756ebc95652e3fb4
+  metadata.gz: ea6b61172b73a0e7446ce90c1b01e848fbb09b14e527ae10a91c78d68e9920d308b8ae8f7cc987c300239048b96b6bdb3c67988e0ed4a22b623c7d20c641fb66
+  data.tar.gz: 46c7a9a28edef3f95a9e4dc4ec083862724cdb9b496d8e32ad973deff47ef1e01cc4f07913f93d046c38337ff5030d540cb9561b29c220c7e3b13fa87fa37d6a

data/build/tdclc/tdclc.rc

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

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclrb/tdclrb.rc

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

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

@@ -123,7 +123,7 @@ void tableCacheCounter::release(const std::string& dbname,
 bool lockTable(THD* thd, TABLE* tb)
 {
     bool append = (thd->lock != 0);
-#ifdef MARIADB_10_1
+#if defined(MARIADB_10_1) || defined(MARIADB_10_2)
     thd->variables.option_bits |= OPTION_TABLE_LOCK;
 #endif
     MYSQL_LOCK* lock = mysql_lock_tables(thd, &tb, 1, 0);

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

@@ -54,7 +54,9 @@
 #include <mysql_version.h>
 
 #if defined(MARIADB_BASE_VERSION)
-#  if (MYSQL_VERSION_ID > 100107) 
+#  if (MYSQL_VERSION_ID > 100200)
+#    define MARIADB_10_2 MYSQL_VERSION_ID
+#  elif (MYSQL_VERSION_ID > 100107)
 #    define MARIADB_10_1 MYSQL_VERSION_ID
 #  elif (MYSQL_VERSION_ID > 100000)
 #    define MARIADB_10_0 MYSQL_VERSION_ID
@@ -75,9 +77,9 @@
 #include "my_global.h"
 #include <math.h>
 #if defined(MYSQL_5_7)
-#ifndef HAVE_REPLICATION
-#define HAVE_REPLICATION
-#endif
+#ifndef HAVE_REPLICATION
+#define HAVE_REPLICATION
+#endif
 
 // Not use malloc service
 #define MYSQL_SERVICE_MYSQL_ALLOC_INCLUDED
@@ -187,7 +189,7 @@ extern "C" {
 #define cp_master_accsess() master_access()
 #define cp_priv_host() host().str
 #define cp_priv_user() user().str
-#else // MySQL 5.6 Mariadb 10.0 10.1                                                              
+#else // MySQL 5.6 Mariadb 10.0 10.1 10.2
 #define cp_get_sql_error() get_stmt_da()->sql_errno()
 #define cp_isOk() get_stmt_da()->is_ok()
 #define cp_set_overwrite_status(A) get_stmt_da()->set_overwrite_status(A)
@@ -195,7 +197,6 @@ extern "C" {
 #define cp_master_accsess() master_access
 #define cp_priv_host() priv_host
 #define cp_priv_user() priv_user
-
 #endif
 
 #if defined(MYSQL_5_5) 
@@ -220,7 +221,7 @@ extern "C" {
 #   endif
 #endif
 
-#if ((MYSQL_VERSION_NUM < 50600) || defined(MARIADB_BASE_VERSION)) //MySQL 5.5 Mariadb 5.5 10.0 10.1
+#if ((MYSQL_VERSION_NUM < 50600) || defined(MARIADB_BASE_VERSION)) // MySQL 5.5 Mariadb 5.5 10.0 10.1 10.2
 
 inline void add_global_thread(THD* thd) {}
 
@@ -231,7 +232,9 @@ inline void cp_thd_release_resources(THD* thd) {}
 inline void cp_restore_globals(THD* thd)
 {
     my_pthread_setspecific_ptr(THR_THD, 0);
+#if ! defined(MARIADB_10_2)
     my_pthread_setspecific_ptr(THR_MALLOC, 0);
+#endif
 }
 #if (MYSQL_VERSION_ID < 50600)
 inline void cp_thd_set_read_only(THD* thd, bool v) {}
@@ -251,7 +254,7 @@ inline bool cp_thd_get_global_read_only(THD* thd)
 inline bool cp_open_table(THD* thd, TABLE_LIST* tables,
                           Open_table_context* ot_act)
 {
-#if defined(MARIADB_10_1)
+#if defined(MARIADB_10_1) || defined(MARIADB_10_2)
     return open_table(thd, tables, ot_act);
 #else
     return open_table(thd, tables, thd->mem_root, ot_act);
@@ -259,16 +262,16 @@ inline bool cp_open_table(THD* thd, TABLE_LIST* tables,
 }
 #define set_mysys_var(A)
 
-inline bool cp_has_insert_default_function(Field* fd) 
-{
-    return fd->unireg_check == Field::TIMESTAMP_DN_FIELD ||
-        fd->unireg_check == Field::TIMESTAMP_DNUN_FIELD;
-}
-
-inline bool cp_has_update_default_function(Field* fd)
-{
-    return fd->unireg_check == Field::TIMESTAMP_UN_FIELD ||
-        fd->unireg_check == Field::TIMESTAMP_DNUN_FIELD;
+inline bool cp_has_insert_default_function(Field* fd) 
+{
+    return fd->unireg_check == Field::TIMESTAMP_DN_FIELD ||
+        fd->unireg_check == Field::TIMESTAMP_DNUN_FIELD;
+}
+
+inline bool cp_has_update_default_function(Field* fd)
+{
+    return fd->unireg_check == Field::TIMESTAMP_UN_FIELD ||
+        fd->unireg_check == Field::TIMESTAMP_DNUN_FIELD;
 }
 
 inline void cp_evaluate_insert_default_function(Field* fd)
@@ -333,15 +336,15 @@ inline bool cp_open_table(THD* thd, TABLE_LIST* tables,
     return open_table(thd, tables, ot_act);
 }
 
-inline bool cp_has_insert_default_function(Field* fd) 
-{
-    return fd->has_insert_default_function();
-}
-
-inline bool cp_has_update_default_function(Field* fd)
-{
-    return fd->has_update_default_function();
-
+inline bool cp_has_insert_default_function(Field* fd) 
+{
+    return fd->has_insert_default_function();
+}
+
+inline bool cp_has_update_default_function(Field* fd)
+{
+    return fd->has_update_default_function();
+
 }
 
 inline void cp_evaluate_insert_default_function(Field* fd)
@@ -359,7 +362,7 @@ inline unsigned char* cp_null_ptr(Field* fd, unsigned char* record)
     return fd->null_offset() + record;
 }
 
-#endif // MySQL 5.6. 5.7
+#endif
 
 #if (MYSQL_VERSION_NUM < 50611)
 #define ha_index_read_map index_read_map
@@ -510,7 +513,10 @@ inline  void cp_set_new_thread_id(THD* thd)
 {
     mysql_mutex_lock(&LOCK_thread_count);
     ++g_openDatabases;
+#if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100200) // MARIADB_10_2
+#else // Not MARIADB_10_2
     thd->variables.pseudo_thread_id = thread_id++;
+#endif
 	add_global_thread(thd);
     mysql_mutex_unlock(&LOCK_thread_count);
     thd->thread_id = thd->variables.pseudo_thread_id;
@@ -579,7 +585,11 @@ inline void cp_open_error_release(THD* thd, TABLE_LIST& tables) {}
 
 inline bool cp_query_command(THD* thd, char* str)
 {
+#if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100200) // MARIADB_10_2
+	return dispatch_command(COM_QUERY, thd, str, (uint)strlen(str), FALSE, FALSE);
+#else // Not MARIADB_10_2
 	return dispatch_command(COM_QUERY, thd, str, (uint)strlen(str));
+#endif
 }
 
 inline void cp_lex_clear(THD* thd)
@@ -587,40 +597,45 @@ inline void cp_lex_clear(THD* thd)
     thd->lex->many_values.empty();
 }
 
-#if defined(MARIADB_10_1) ||  defined(MARIADB_10_0)
+#if defined(MARIADB_10_2) || defined(MARIADB_10_1) || defined(MARIADB_10_0) // MariaDB 10.0 10.1 10.2
 #define NO_LOCK_OPEN
 inline TABLE_SHARE* cp_get_cached_table_share(THD* thd, const char *db, const char *name)
 {
-	return tdc_acquire_share(thd, db, name, GTS_VIEW |GTS_TABLE );
+#if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100200) // MARIADB_10_2
+	TABLE_LIST table;
+	table.init_one_table(db, strlen(db), name, strlen(name), name, TL_READ);
+	return tdc_acquire_share(thd, &table, GTS_VIEW |GTS_TABLE);
+#else // Not MARIADB_10_2
+	return tdc_acquire_share(thd, db, name, GTS_VIEW |GTS_TABLE);
+#endif
 }
 inline void cp_tdc_release_share(TABLE_SHARE* s)
 {
     tdc_release_share(s);
 }
 
-    #if defined(MARIADB_10_1)
+    #if defined(MARIADB_10_2) || defined(MARIADB_10_1) // MariaDB 10.1 10.2
     inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
                           void *create_info_arg, int with_db_name) 
     {
         return show_create_table(thd, table_list,  packet, 
                 (Table_specification_st*)create_info_arg, (enum_with_db_name) with_db_name);
     } 
-    #elif (MARIADB_10_0 >= 100013)
+    #elif (MARIADB_10_0 >= 100013) // MariaDB 10.0.13 or later
     inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
                           void *create_info_arg, int with_db_name) 
     {
         return show_create_table(thd, table_list,  packet, 
                 (HA_CREATE_INFO*)create_info_arg, (enum_with_db_name) with_db_name);
     }
-    #else //Mariadb 10.0.9 - .12
+    #else // Mariadb 10.0.12 or lesser
     inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
                           HA_CREATE_INFO* create_info_arg, int with_db_name)
     {
         return store_create_info(thd, table_list, packet, create_info_arg, with_db_name!=0, FALSE);
     }
-    
     #endif
-#else // Not MARIADB_10_1 || MARIADB_10_0
+#else // Not MariaDB 10.0 10.1 10.2
 
 
 inline TABLE_SHARE* cp_get_cached_table_share(THD* /*thd*/, const char *db, const char *name)
@@ -635,27 +650,37 @@ inline int cp_store_create_info(THD *thd, TABLE_LIST *table_list, String *packet
 
 #define cp_get_executed_gtids get_logged_gtids
 
-#endif // Not MARIADB_10_1 || MARIADB_10_0
+#endif // MariaDB 10.0 10.1 10.2
 
-#define STATUS_VAR_SCOPE 
+#define STATUS_VAR_SCOPE
+
+#if defined(MARIADB_10_2)
+#define DSMRR_SIZE  sizeof(DsMrr_impl)
+#else
 #define DSMRR_SIZE  0
-#endif // Not MySQL 5.7
+#endif
 
+#endif
 
-#if (MYSQL_VERSION_ID < 50600) || defined(MARIADB_10_0) 
-    #if defined(MARIADB_10_0)
-    inline bool cp_tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
-                        const char *cache_key, uint cache_key_length,  uint flags)
-    {
-        return tdc_open_view(thd, table_list, alias, cache_key , cache_key_length, thd->mem_root, flags);
-    }
-    #else
-    inline bool cp_tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
-                        const char *cache_key, uint cache_key_length,  uint flags)
-    {
-        return tdc_open_view(thd, table_list, alias, (char *)cache_key , cache_key_length, thd->mem_root, flags);
-    }
-    #endif
+
+#if defined(MARIADB_10_2) // MariaDB 10.2
+inline bool cp_tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
+                    const char *cache_key, uint cache_key_length,  uint flags)
+{
+    return tdc_open_view(thd, table_list, flags);
+}
+#elif defined(MARIADB_10_0) // MariaDB 10.0
+inline bool cp_tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
+                    const char *cache_key, uint cache_key_length,  uint flags)
+{
+    return tdc_open_view(thd, table_list, alias, cache_key , cache_key_length, thd->mem_root, flags);
+}
+#elif (MYSQL_VERSION_ID < 50600) // MySQL 5.5
+inline bool cp_tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias,
+                    const char *cache_key, uint cache_key_length,  uint flags)
+{
+    return tdc_open_view(thd, table_list, alias, (char *)cache_key , cache_key_length, thd->mem_root, flags);
+}
 #else
 #define cp_tdc_open_view tdc_open_view
 #endif
@@ -675,9 +700,9 @@ inline uint cp_get_table_def_key(THD *thd, TABLE_LIST* tables, const char** key)
    make_db_list function is not static, but it is not list in sql_show.h.  
 */
 
-#if (defined(MARIADB_10_0) || defined(MARIADB_10_1))
+#if (defined(MARIADB_10_0) || defined(MARIADB_10_1) || defined(MARIADB_10_2)) // MariaDB 10.0 10.1 10.2
     typedef Dynamic_array<LEX_STRING*> SQL_Strings;
-#if (!defined(MARIADB_10_1))
+#if (defined(MARIADB_10_0))
     typedef struct st_lookup_field_values
     {
         LEX_STRING db_value, table_value;
@@ -693,29 +718,29 @@ inline uint cp_get_table_def_key(THD *thd, TABLE_LIST* tables, const char** key)
         memset(&lv, 0 ,sizeof(LOOKUP_FIELD_VALUES));
         return make_db_list(thd, files, &lv);
     }
-#else
+#else // Not MariaDB 10.0 10.1 10.2
     typedef List<LEX_STRING> SQL_Strings;
     inline int db_list(THD *thd, SQL_Strings *files)
     {
 #ifdef FINDFILE_6PRAMS
-        MEM_ROOT tmp_mem_root;
-#		ifdef MYSQL_578_LATER
-			init_sql_alloc(key_memory_get_all_tables, &tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
-#		else
+        MEM_ROOT tmp_mem_root;
+#		ifdef MYSQL_578_LATER
+			init_sql_alloc(key_memory_get_all_tables, &tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
+#		else
 			init_sql_alloc(&tmp_mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
 #		endif
         return find_files(thd, files, NullS,  mysql_data_home, "", true, &tmp_mem_root);
 #else
         return find_files(thd, files, NullS,  mysql_data_home, "", true);
-#endif        
-    }
 #endif
+    }
+#endif // MariaDB 10.0 10.1 10.2
 
 
-#if (defined(MARIADB_10_1) && MARIADB_10_1 > 100108)
+#if defined(MARIADB_10_2) || (defined(MARIADB_10_1) && MARIADB_10_1 > 100108) // later than MariaDB 10.1.8
 inline void cp_setup_rpl_bitmap(TABLE* table)
 {
-    bitmap_set_all(table->write_set);
+    bitmap_set_all(table->write_set);
     table->rpl_write_set = table->write_set;
 }
 #else
@@ -724,6 +749,15 @@ inline void cp_setup_rpl_bitmap(TABLE* table){};
 
 #endif
 
+inline frm_type_enum cp_dd_frm_type(THD *thd, char *path)
+{
+#if defined(MARIADB_10_2) || (defined(MARIADB_10_1) && MARIADB_10_1 >= 100122) // MariaDB 10.1.22 or later
+	return dd_frm_type(thd, path, NULL);
+#else
+	enum legacy_db_type not_used;
+	return dd_frm_type(thd, path, &not_used);
+#endif
+}
 
 class safe_mysql_mutex_lock
 {
@@ -744,20 +778,20 @@ public:
 
 struct innodb_prebuit
 {
-	ulong		magic_n;
-	void*	    table;
-	void*	    index;
-	void*		trx;
-    //unsigned int dummy; // Bit flags
-    
-	unsigned	sql_stat_start:1;
-#ifndef MYSQL_5_7 
-	unsigned	mysql_has_locked:1;
-#endif
-	unsigned	clust_index_was_generated:1;
-	unsigned	index_usable:1;
-	unsigned	read_just_key:1;
-	unsigned	used_in_HANDLER:1;
+	ulong		magic_n;
+	void*	    table;
+	void*	    index;
+	void*		trx;
+    //unsigned int dummy; // Bit flags
+    
+	unsigned	sql_stat_start:1;
+#if ! (defined(MYSQL_5_7) || defined(MARIADB_10_2))
+	unsigned	mysql_has_locked:1;
+#endif
+	unsigned	clust_index_was_generated:1;
+	unsigned	index_usable:1;
+	unsigned	read_just_key:1;
+	unsigned	used_in_HANDLER:1;
 	unsigned	template_type:2;
     
     void* dummy2; //mysql_row_templ_t* mysql_template

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

@@ -82,19 +82,19 @@ public:
     bool send_result_set_metadata(List<Item> *list, uint flags){return false;}
     virtual bool write(){return false;};
     virtual void prepare_for_resend(){}
-    virtual bool store_null(){return false;}
-    virtual bool store_tiny(longlong from){return store_longlong(from, false);}
-    virtual bool store_short(longlong from){return store_longlong(from, false);}
-    virtual bool store_long(longlong from){return store_longlong(from, false);}
-    virtual bool store_decimal(const my_decimal *){return false;}
-    virtual bool store(float from, uint32 decimals, String *buffer){return false;}
-    virtual bool store(double from, uint32 decimals, String *buffer){return false;}
-    virtual bool store(MYSQL_TIME *time, uint precision){return false;}
-    virtual bool store_date(MYSQL_TIME *time){return false;}
-    virtual bool store_time(MYSQL_TIME *time, uint precision){return false;}
-    virtual bool store(Field *field){return false;}
-    virtual bool store(const char *from, size_t length, const CHARSET_INFO *fromcs,
-                     const CHARSET_INFO* /*tocs*/){return false;}
+    virtual bool store_null(){return false;}
+    virtual bool store_tiny(longlong from){return store_longlong(from, false);}
+    virtual bool store_short(longlong from){return store_longlong(from, false);}
+    virtual bool store_long(longlong from){return store_longlong(from, false);}
+    virtual bool store_decimal(const my_decimal *){return false;}
+    virtual bool store(float from, uint32 decimals, String *buffer){return false;}
+    virtual bool store(double from, uint32 decimals, String *buffer){return false;}
+    virtual bool store(MYSQL_TIME *time, uint precision){return false;}
+    virtual bool store_date(MYSQL_TIME *time){return false;}
+    virtual bool store_time(MYSQL_TIME *time, uint precision){return false;}
+    virtual bool store(Field *field){return false;}
+    virtual bool store(const char *from, size_t length, const CHARSET_INFO *fromcs,
+                     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; };
@@ -104,7 +104,7 @@ public:
 #elif defined(MYSQL_5_5)
     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, 
+    virtual bool store(const char *from, size_t length, 
     CHARSET_INFO *fromcs, CHARSET_INFO *tocs){return false;}
 #elif defined(MYSQL_5_7) 
     bool store_decimal(const my_decimal *, uint, uint){ return true; }
@@ -161,15 +161,15 @@ public:
         return false;
     }
 #else
-    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
+    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
     {
         if (m_index == 0)
             strncpy(m_bpos->filename, from, BINLOGNAME_SIZE);
         else if (m_index == 3)
         {
-            if (length)
-            {
-                m_bpos->type = REPL_POSTYPE_GTID;
+            if (length)
+            {
+                m_bpos->type = REPL_POSTYPE_GTID;
                 m_bb->addBlob((unsigned int)length + 1, 0, (const unsigned char *)from);
                 m_bb->setFieldCount(1);
             }
@@ -199,7 +199,7 @@ bool safe_commit_lock::lock()
         #else
         mdl_request.init(MDL_key::COMMIT, "", "", MDL_SHARED, MDL_EXPLICIT);
         #endif
-        if (m_thd->mdl_context.acquire_lock(&mdl_request,
+        if (m_thd->mdl_context.acquire_lock(&mdl_request,
                                     m_thd->variables.lock_wait_timeout))
             return false;
         m_commits_lock = mdl_request.ticket;
@@ -260,22 +260,22 @@ safe_commit_lock::~safe_commit_lock()
     inline void readGtid(binlogPos* bpos, bzs::db::IblobBuffer* bb)
     {
         #if (MYSQL_VERSION_ID > 50600)
-        char p[1024] = { 0 };
-        char* buf = p;
+        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;
+        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, TD_EXTENDED_VAR_BINLOG_GTID, (const unsigned char *)buf);
             bb->setFieldCount(1);
-            if (p != buf) delete[] buf;
-        }
-        global_sid_lock->unlock();
+            if (p != buf) delete[] buf;
+        }
+        global_sid_lock->unlock();
         #endif
     }
 
@@ -380,7 +380,7 @@ public:
         return str_store(from, length);
     }
 #else
-    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
+    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
     {
         return str_store(from, length);
     }
@@ -489,7 +489,7 @@ public:
         return false;
     }
 #else
-    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
+    bool store(const char *from, size_t length, const CHARSET_INFO *cs)
     {
         return str_store(from, length);
     }
@@ -516,7 +516,7 @@ public:
 #pragma warning(disable : 4271)
 #pragma warning(disable : 4267)
 #pragma warning(disable : 4244)
-#if (defined(MARIADB_10_0) || defined(MARIADB_10_1))
+#if (defined(MARIADB_10_0) || defined(MARIADB_10_1) || defined(MARIADB_10_2))
 #include "sql/slave.h"
 #include "sql/rpl_mi.h"
 
@@ -545,12 +545,12 @@ int getChannels(THD* /*thd*/, connection::records& recs)
 #include "sql/rpl_msr.h" //channel_map
 int getChannels(THD* thd, connection::records& recs)
 {
-    channel_map.rdlock();
+    channel_map.rdlock();
     uint_td size = channel_map.get_num_instances();
     if (size)
     {
-        for (mi_map::iterator it = channel_map.begin(); it != channel_map.end(); it++)
-        {
+        for (mi_map::iterator it = channel_map.begin(); it != channel_map.end(); it++)
+        {
             Master_info* mi = it->second;
             if (mi && mi->host[0])
             {
@@ -583,7 +583,7 @@ int getSlaveStatus(THD* thd, const char* channel, connection::records& recs, bzs
     char tmp[128];
 #if (defined(MYSQL_5_7))
     sprintf_s(tmp, 128, "show slave status for channel '%s'", channel);
-#elif (defined(MARIADB_10_1) || defined(MARIADB_10_0))
+#elif (defined(MARIADB_10_2) || defined(MARIADB_10_1) || defined(MARIADB_10_0))
     sprintf_s(tmp, 128, "show slave '%s' status", channel);
 #else
     sprintf_s(tmp, 128, "show slave status");
@@ -616,7 +616,7 @@ void readDbList(THD* thd, connection::records& recs)
 {
     SQL_Strings files;
     db_list(thd, &files);
-#if (defined(MARIADB_10_0) || defined(MARIADB_10_1))
+#if (defined(MARIADB_10_0) || defined(MARIADB_10_1) || defined(MARIADB_10_2))
     for (int i = 0; i < (int)files.elements(); ++i)
         appenDbList(recs, files.at(i));
 #else
@@ -633,7 +633,7 @@ void readDbList(THD* thd, connection::records& recs)
 
 bool setGrant(THD* thd, const char* host, const char* user,  const char* db)
 {
-    // sctx->master_access and sctx->db_access
+    // sctx->master_access and sctx->db_access
     return (acl_getroot(cp_security_ctx(thd), cp_strdup(user, MYF(0)),
     cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)db)) == false;
 }
@@ -669,11 +669,11 @@ public:
         }
         #ifdef NOTUSE_BINLOG_VAR
         close_cached_tables(NULL, NULL, FALSE , 50000000L);
-        if (m_thd->global_read_lock.make_global_read_lock_block_commit(m_thd))
-        {
-            m_thd->global_read_lock.unlock_global_read_lock(m_thd);
-            m_thd = NULL;
-            return false;
+        if (m_thd->global_read_lock.make_global_read_lock_block_commit(m_thd))
+        {
+            m_thd->global_read_lock.unlock_global_read_lock(m_thd);
+            m_thd = NULL;
+            return false;
         }
         #endif
         return true;

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

@@ -128,10 +128,12 @@ THD* buildTHD()
 {
     if (!mysqld_server_started)
         waitForServerStart();
-
+#if defined(MARIADB_10_2)
+    THD* thd = new THD(next_thread_id());
+#else
     THD* thd = new THD();
-    
     cp_set_new_thread_id(thd);
+#endif
     
     thd->thread_stack = reinterpret_cast<char*>(&thd);
     thd->store_globals();

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

@@ -226,7 +226,7 @@ tabledef* schemaBuilder::getTabledef(engine::mysql::table* src, int id,
             }
 
             if (fd.type == ft_mydecimal)
-                fd.digits = my_decimal_length_to_precision(f->field_length, f->decimals(),
+                fd.digits = my_decimal_length_to_precision(f->field_length, f->decimals(),
 								(f->flags & UNSIGNED_FLAG) != 0);
  
             fd.setPadCharSettings(false, true);
@@ -413,9 +413,7 @@ void schemaBuilder::listTable(database* db, std::vector<std::string>& tables, in
             std::string s = it->path().string(); // fullpath
             if (isFrmFile(it->path().filename().string(), false)) // filename
             {
-                enum legacy_db_type not_used;
-                
-                frm_type_enum ftype = dd_frm_type(db->thd(), (char*)s.c_str(), &not_used);
+                frm_type_enum ftype = cp_dd_frm_type(db->thd(), (char*)s.c_str());
                 filename_to_tablename(it->path().stem().string().c_str(), path, FN_REFLEN);
                 std::string tablename = path;
                 
@@ -476,8 +474,7 @@ short schemaBuilder::execute(database* db, table* mtb, bool nouseNullkey)
             std::string s = it->path().filename().string();
             if (isFrmFile(s))
             {
-                enum legacy_db_type not_used;
-                frm_type_enum ftype = dd_frm_type(db->thd(), (char*)it->path().string().c_str(), &not_used);
+                frm_type_enum ftype = cp_dd_frm_type(db->thd(), (char*)it->path().string().c_str());
                 if (ftype == FRMTYPE_TABLE)
                 {
                     filename_to_tablename(it->path().stem().string().c_str(), path,

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

@@ -670,7 +670,7 @@ struct handshale_t
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
 #define C_INTERFACE_VER_MINOR "7"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "3"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -734,7 +734,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "7"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "2"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "3"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -771,6 +771,6 @@ struct handshale_t
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
 #define TRANSACTD_VER_MINOR 7//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 3//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/test/tdclphp/transactd_Test.php

@@ -345,7 +345,7 @@ class TransactdTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($client_ver->minorVersion, Transactd::CPP_INTERFACE_VER_MINOR);
         $this->assertEquals(chr($client_ver->type), 'N');
         $my5x = ($server_ver->majorVersion == 5) && ($server_ver->minorVersion >= 5);
-        $maria10 = ($server_ver->majorVersion == 10) && ($server_ver->minorVersion <= 1);
+        $maria10 = ($server_ver->majorVersion == 10) && ($server_ver->minorVersion <= 2);
         $this->assertTrue($my5x || $maria10);
         $tmp = (chr($server_ver->type) == 'M') || (chr($server_ver->type) == 'A');
         $this->assertTrue($tmp);

data/source/bzs/test/tdclphp/transactd_v3_Test.php

@@ -903,7 +903,6 @@ class TransactdTest extends PHPUnit_Framework_TestCase
         $db->execSql("create view idlessthan5 as select * from user where id < 5");
         $view = $db->getCreateViewSql("idlessthan5");
         $this->assertEquals((strpos($view, "idlessthan5") !== false), true);
-        $this->assertEquals((strpos($view, "名前") !== false), true);
         //echo($view);
         $tb = $db->openTable("user");
         $this->assertEquals($db->stat(), 0);

data/source/bzs/test/tdclrb/transactd_spec.rb

@@ -236,7 +236,7 @@ def testVersion()
   expect(client_ver.minorVersion.to_s).to eq Transactd::CPP_INTERFACE_VER_MINOR.to_s
   expect(client_ver.type.chr).to eq 'N'
   my5x = (server_ver.majorVersion == 5) && (server_ver.minorVersion >= 5)
-  maria10 = (server_ver.majorVersion == 10) && (server_ver.minorVersion <= 1)
+  maria10 = (server_ver.majorVersion == 10) && (server_ver.minorVersion <= 2)
   expect(my5x || maria10).to be true
   tmp = (server_ver.type.chr == 'M') || (server_ver.type.chr == 'A')
   expect(tmp).to be true

data/source/bzs/test/tdclrb/transactd_v3_spec.rb

@@ -932,7 +932,6 @@ describe Transactd, 'V3Features' do
     db.execSql("create view idlessthan5 as select * from user where id < 5")
     view = db.getCreateViewSql("idlessthan5")
     expect(view.include?("idlessthan5")).to eq true
-    expect(view.include?("名前")).to eq true
     #puts("view" + view)
     tb = db.openTable("user")
     expect(db.stat()).to eq 0

data/source/bzs/test/trdclengn/test_trdclengn.cpp

@@ -316,7 +316,7 @@ void testVersion(database* db)
                 "mysql_server_Major = " << vv.versions[VER_IDX_DB_SERVER].majorVersion);
             BOOST_CHECK_MESSAGE(
                 ((5 <= vv.versions[VER_IDX_DB_SERVER].minorVersion) ||
-                 (1 >= vv.versions[VER_IDX_DB_SERVER].minorVersion)),
+                 (2 >= vv.versions[VER_IDX_DB_SERVER].minorVersion)),
                 "mysql_server_Miner = " << vv.versions[VER_IDX_DB_SERVER].minorVersion);
             int type = (int)vv.versions[VER_IDX_DB_SERVER].type;
             BOOST_CHECK_MESSAGE(((int)'M' == type) || ((int)'A' == type),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp