transactd 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7abf08f4fbb6ae8be30ab0a8621eab5239758b
-  data.tar.gz: b3ee43a9939a276f4ab9578eb7670fa8392ec5fc
+  metadata.gz: 2de552536553b6f1ec957ded4f1c690fe8cec516
+  data.tar.gz: 0ba45cc088a557220ad580c41425a71c66703090
 SHA512:
-  metadata.gz: 44ad488e33db8e808097073e000bda47a5a8e9959f2f916b6ad2618ae42376d54eeed12ea256e7a473f2b8fba1559a35dfd2d0a055caaf98e955a16767732a74
-  data.tar.gz: b7e5bf6bbc400ccf8cefc8fec44b1611cc74e091b346ab02edca1f1c9f0792b777ab22d689af6424937041a9424143f838872d371361ecec21a3b4bc23b656a7
+  metadata.gz: 14aeb6ef47eac061acf54e79abe374d91b7c855bb2a2469918d78685ba652690eea12ec7d376d2931019d771e6f8415f8ec82eac5da9361f64cc927ac268fb4b
+  data.tar.gz: 58918f295465ee10d3cd28312133fa4018e4aae8c23f79e510a6bf800f6d5d594a094afd21878818fe775d11f1b2e8b04b96069241a6cfd57e62139f59c83965

data/README-JA.md

@@ -228,7 +228,9 @@ loose-transactd_hostcheck_username = yourUserName
 ```
 を加えてください。yourUserNameは任意のユーザー名にできます。
 
-
+### ファイアーウォールの設定
+TransactdプラグインはデフォルトでTCPポート8610を使用します。もし、このポートが
+ブロックされている場合は、クライアントホストからアクセスできるように設定します。
 
 テストとベンチマークの起動
 -------------------------------------------------------------------------------

data/README.md

@@ -229,7 +229,9 @@ loose-transactd_hostcheck_username = yourUserName
 ```
 Replace yourUserName to an actual user name.
 
-
+### Setting of firewall
+Transactd Plugin is used TCP port 8610 as default. If this port is blocked, 
+please be able to access from your client host.
 
 Execution of test and benchmark program
 -------------------------------------------------------------------------------

data/build/common/smart_install.cmake

@@ -112,7 +112,7 @@ macro(bz_do_smart_install_dll)
   string(STRIP "${tmp_var}" tmp_var)
   string(REGEX REPLACE "\n" ";" tmp_list "${tmp_var}")
   foreach(tmp_line ${tmp_list})
-    message(STATUS "${tmp_line}")
+    #message(STATUS "${tmp_line}")
     foreach(tmp_key "Installing-if-grater: " "Up-to-date-if-grater: ")
       string(REGEX MATCH "${tmp_key}(.*)" tmp_filename "${tmp_line}")
       string(STRIP "${tmp_filename}" tmp_filename)

data/build/common/system.cmake

@@ -50,26 +50,34 @@ if(NOT COMMAND bz_get_compiler)
 macro(bz_get_compiler)
   set(BZ_COMPILER "")
   if(WIN32)
-    if(MSVC60)
-      set(BZ_COMPILER "_vc60")
-    elseif(MSVC70)
-      set(BZ_COMPILER "_vc70")
-    elseif(MSVC80)
-      set(BZ_COMPILER "_vc80")
-    elseif(MSVC90)
-      set(BZ_COMPILER "_vc90")
-    elseif(MSVC10)
-      set(BZ_COMPILER "_vc100")
-    elseif(MSVC11)
-      set(BZ_COMPILER "_vc110")
-    elseif(MSVC12)
-      set(BZ_COMPILER "_vc120")
+    if(MSVC)
+      if(MSVC60)
+        set(BZ_COMPILER "_vc60")
+      elseif(MSVC70)
+        set(BZ_COMPILER "_vc70")
+      elseif(MSVC80)
+        set(BZ_COMPILER "_vc80")
+      elseif(MSVC90)
+        set(BZ_COMPILER "_vc90")
+      elseif(MSVC10)
+        set(BZ_COMPILER "_vc100")
+      elseif(MSVC11)
+        set(BZ_COMPILER "_vc110")
+      elseif(MSVC12)
+        set(BZ_COMPILER "_vc120")
+      elseif(MSVC14)
+        set(BZ_COMPILER "_vc140")
+      else()
+        MESSAGE(FATAL_ERROR "Unknown Visual Studio version.")
+      endif()
     elseif(MINGW)
       string(REPLACE "." ";" tmp_list ${CMAKE_CXX_COMPILER_VERSION})
       list (GET tmp_list 0 MINGW_MAJOR)
       list (GET tmp_list 1 MINGW_MINOR)
       list (GET tmp_list 2 MINGW_RELEASE)
       set(BZ_COMPILER "_mgw${MINGW_MAJOR}${MINGW_MINOR}")
+    else()
+      MESSAGE(FATAL_ERROR "Unknown compiler.")
     endif()
   endif()
 endmacro()
@@ -121,4 +129,3 @@ macro(bz_get_win_sysdir)
   endif()
 endmacro()
 endif()
-

data/build/common/transactd_common.cmake

@@ -184,7 +184,7 @@ macro(transactd_set_MTMD MT_OR_MD)
     string(TOUPPER "${MT_OR_MD}" MT_OR_MD)
     if( (NOT ("${MT_OR_MD}" STREQUAL "MT")) AND
         (NOT ("${MT_OR_MD}" STREQUAL "MD")))
-      message(ERROR "[${MT_OR_MD}] is invalid. Please specify MT or MD.")
+      message(SEND_ERROR "[${MT_OR_MD}] is invalid. Please specify MT or MD.")
     endif()
     foreach(build_type "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL")
       set(CMAKE_CXX_FLAGS${build_type}_BEFORE_${this_target} "${CMAKE_CXX_FLAGS${build_type}}")
@@ -321,7 +321,7 @@ macro(transactd_link_boost_libraries boost_components)
       endif()
       
       transactd_has_MD_option("${CMAKE_CXX_FLAGS_${BUILD_TYPE}}")
-      message(STATUS "CMAKE_CXX_FLAGS_${BUILD_TYPE} = ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} IS_MD=${IS_MD}")
+      #message(STATUS "CMAKE_CXX_FLAGS_${BUILD_TYPE} = ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} IS_MD=${IS_MD}")
       if ("${IS_MD}" STREQUAL "ON")
          if("${BUILD_TYPE}" STREQUAL "DEBUG")
            set(boost_libs_for${BT_NAME} "${Boost_LIBRARIES_STATIC_USE_RUNTIME_DEBUG}")

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,4,97
- PRODUCTVERSION 2,4,4,97
+ FILEVERSION 2,4,5,103
+ PRODUCTVERSION 2,4,5,103
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.4.4.97"
+            VALUE "FileVersion", "2.4.5.103"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.4.97"
+            VALUE "ProductVersion", "2.4.5.103"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/CMakeLists.txt

@@ -49,7 +49,7 @@ elseif("${this_target}" STREQUAL "tdclcppmr")
   set(TDCL_CPP_CHARSET m)
   set(TDCL_CPP_USE_RUNTIME_LIBS ON)
 else()
-  message(ERROR "Invalid project name ${this_target}")
+  set(TDCL_CPP_USE_RUNTIME_LIBS OFF)
 endif()
 
 
@@ -139,7 +139,7 @@ else()
       LINUX)
   else()
     set_property(TARGET ${this_target} APPEND PROPERTY COMPILE_DEFINITIONS
-      WIN32 _WIN32)
+      WIN32 _WIN32 _SYS_TIME_H_ _GETTIMEOFDAY_DEFINED)
   endif()
 endif()
 if(TRANSACTD_RUBY_GEM OR TRANSACTD_PHP)

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,4,97
- PRODUCTVERSION 2,4,4,97
+ FILEVERSION 2,4,5,103
+ PRODUCTVERSION 2,4,5,103
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "2.4.4.97"
+            VALUE "FileVersion", "2.4.5.103"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.4.97"
+            VALUE "ProductVersion", "2.4.5.103"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/CMakeLists.txt

@@ -59,8 +59,8 @@ endif()
 if("${TRANSACTD_RUBY_LIBRARY_PATH}" STREQUAL "")
   set(TRANSACTD_RUBY_LIBRARY_PATH "${RUBY_LIB_PATH}")
 endif()
-message(STATUS "  TRANSACTD_RUBY_INCLUDE_PATH ${TRANSACTD_RUBY_INCLUDE_PATH}")
-message(STATUS "  TRANSACTD_RUBY_LIBRARY_PATH ${TRANSACTD_RUBY_LIBRARY_PATH}")
+#message(STATUS "  TRANSACTD_RUBY_INCLUDE_PATH ${TRANSACTD_RUBY_INCLUDE_PATH}")
+#message(STATUS "  TRANSACTD_RUBY_LIBRARY_PATH ${TRANSACTD_RUBY_LIBRARY_PATH}")
 set(TDCL_GEM_PREFIX "${RUBY_VERSION_FOR_GEM}")
 if("${TRANSACTD_RUBY_GEM_ROOT_PATH}" STREQUAL "")
   set(TRANSACTD_RUBY_GEM_ROOT_PATH "${TRANSACTD_BINARY_ROOT}")
@@ -69,10 +69,10 @@ endif()
 # ==========================================================
 # add library path
 # ==========================================================
-if(WIN32)
+if(WIN32)
   link_directories("${TRANSACTD_RUBY_GEM_ROOT_PATH}/bin/common")
 else()
- link_directories("../tdclcpp")
+ link_directories("../tdclcpp")
 endif()
 
 

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,4,97
- PRODUCTVERSION 2,4,4,97
+ FILEVERSION 2,4,5,103
+ PRODUCTVERSION 2,4,5,103
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "2.4.4.97"
+            VALUE "FileVersion", "2.4.5.103"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.4.97"
+            VALUE "ProductVersion", "2.4.5.103"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -114,7 +114,9 @@ void tableCacheCounter::release(const std::string& dbname,
 bool lockTable(THD* thd, TABLE* tb)
 {
     bool append = (thd->lock != 0);
-
+#ifdef MARIADDB_10_1
+    thd->variables.option_bits |= OPTION_TABLE_LOCK;
+#endif
     MYSQL_LOCK* lock = mysql_lock_tables(thd, &tb, 1, 0);
     if (!append)
         thd->lock = lock;
@@ -267,10 +269,10 @@ unsigned char* database::getUserSha1Passwd(const char* host, const char* user,
 // true ok false fail
 bool database::setGrant(const char* host, const char* user)
 {
-	bool ret = (acl_getroot(cp_security_ctx(m_thd), cp_strdup(user, MYF(0)),
+	bool ret = (acl_getroot(cp_security_ctx(m_thd), cp_strdup(user, MYF(0)),
 		cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)m_dbname.c_str())) == false;
     if (ret)
-        check_access(m_thd, SELECT_ACL, m_dbname.c_str(), &m_privilege, NULL, false, true);
+        check_access(m_thd, SELECT_ACL, m_dbname.c_str(), &m_privilege, NULL, false, true);
                 
     return ret;
 }
@@ -279,9 +281,9 @@ bool database::setGrant(const char* host, const char* user)
 short database::aclReload()
 {
     if (name() != "mysql")
-        return STATUS_ACCESS_DENIED;
-    if(!(m_privilege & GRANT_ACL))
-        return STATUS_ACCESS_DENIED;
+        return STATUS_ACCESS_DENIED;
+    if(!(m_privilege & GRANT_ACL))
+        return STATUS_ACCESS_DENIED;
     short ret = STATUS_SUCCESS;
 
     THD* thdCur = _current_thd();
@@ -708,9 +710,9 @@ TABLE* database::doOpenTable(const std::string& name, short mode,
     m_thd->variables.lock_wait_timeout = OPEN_TABLE_TIMEOUT_SEC;
     tables.init_one_table(m_dbname.c_str(), m_dbname.size(), name.c_str(),
 		name.size(), name.c_str(), TL_READ);
-    if(!(m_privilege & SELECT_ACL) &&
-        (check_grant(m_thd, SELECT_ACL, &tables, FALSE, 1, true)))
-    {
+    if(!(m_privilege & SELECT_ACL) &&
+        (check_grant(m_thd, SELECT_ACL, &tables, FALSE, 1, true)))
+    {
         m_stat = STATUS_ACCESS_DENIED;
         return NULL;
     }
@@ -983,6 +985,17 @@ table::table(TABLE* myTable, database& db, const std::string& name, short mode,
                 m_nonKeySegNullFields.push_back(fd);
         }
     }
+    // Chash timestamp field
+    for (int i = 0; i < (int)m_table->s->fields; ++i)
+    {
+        Field* fd = m_table->field[i];
+        if (fd->unireg_check == Field::TIMESTAMP_UN_FIELD ||
+            fd->unireg_check == Field::TIMESTAMP_DNUN_FIELD ||
+            fd->unireg_check == Field::TIMESTAMP_DN_FIELD)
+        {
+            m_timeStampFields.push_back(fd);
+        }
+    }
 }
 
 table::~table()
@@ -2164,6 +2177,30 @@ void table::setFiledNullFlags()
     }
 }
 
+void table::setTimeStamp(bool insert)
+{
+    if (m_timeStampFields.size())
+        m_db.setCurTime();
+    std::vector<Field*>::iterator it = m_timeStampFields.begin();
+    while (it != m_timeStampFields.end())
+    {
+        /*if (g_timestamp_always)
+        {
+            if ((insert && cp_has_insert_default_function((*it))) ||
+                (!insert && cp_has_update_default_function((*it))))
+                (*it)->store(0.0f);
+        }*/
+        if (/*!(*it)->is_null() &&*/ ((*it)->val_real() == 0))
+        {
+            if (insert)
+                cp_evaluate_insert_default_function((*it));
+            else
+                cp_evaluate_update_default_function((*it));
+        }
+        ++it;
+    }  
+}
+
 __int64 table::insert(bool ncc)
 {
     if ((m_mode == TD_OPEN_READONLY) || (m_table->reginfo.lock_type < TL_WRITE))
@@ -2177,6 +2214,7 @@ __int64 table::insert(bool ncc)
         autoincSetup setup(m_table);
         setKeyNullFlags();
         setFiledNullFlags();
+		setTimeStamp(true /* insert */);
 
         m_stat = m_table->file->ha_write_row(m_table->record[0]);
         autoincValue = m_table->file->insert_id_for_cur_row;
@@ -2248,7 +2286,7 @@ void table::beginDel()
                 movePos(position(true), -1, true);
 
             // Has blob fields then ignore conflicts.
-            if ((m_table->s->blob_fields == 0) &&
+            if ((m_stat == 0) && (m_table->s->blob_fields == 0) &&
                 cmp_record(m_table, record[1]))
                 m_stat = STATUS_CHANGE_CONFLICT;
 
@@ -2271,6 +2309,7 @@ void table::update(bool ncc)
     {
         int nullFieldsOfCurrentKey = setKeyNullFlags();
         setFiledNullFlags();
+		setTimeStamp(false /* update */);
         m_stat = m_table->file->ha_update_row(m_table->record[1],
                                               m_table->record[0]);
         if (m_stat == 0 || (m_stat == HA_ERR_RECORD_IS_THE_SAME))

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

@@ -195,6 +195,7 @@ public:
     }
 
     short aclReload();
+    inline void setCurTime(){m_thd->set_current_time();}
 
     static tableCacheCounter tableRef;
 
@@ -267,6 +268,7 @@ class table : private boost::noncopyable
     String m_str;
     keynumConvert m_keyconv;
     IblobBuffer* m_blobBuffer;
+	std::vector<Field*> m_timeStampFields;
     std::vector<Field*> m_nonKeySegNullFields;
     unsigned int m_readCount;
     unsigned int m_updCount;
@@ -300,6 +302,7 @@ class table : private boost::noncopyable
     void seekPos(const uchar* pos);
     int setKeyNullFlags();
     void setFiledNullFlags();
+	void setTimeStamp(bool insert);
 
     bookmarks* bms();
     int percentage(uchar* first, uchar* last, uchar* cur);

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

@@ -45,14 +45,21 @@
 #pragma warning(disable : 4996)
 #pragma warning(disable : 4805)
 #pragma warning(disable : 4005)
+#pragma warning(disable : 4101)
 #define NOMINMAX 
 #endif
 #include <my_config.h>
 #include <mysql_version.h>
-#if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100000)
-#define MARIADDB_10_0 MYSQL_VERSION_ID
+
+#if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100107)
+#   define MARIADDB_10_1 MYSQL_VERSION_ID
+#else 
+#   if defined(MARIADB_BASE_VERSION) && (MYSQL_VERSION_ID > 100000)
+#       define MARIADDB_10_0 MYSQL_VERSION_ID
+#   endif
 #endif
 
+
 #include <sql/sql_const.h>
 #include "my_global.h"
 #include <math.h>
@@ -117,6 +124,7 @@ extern "C" {
 #pragma warning(default : 4800)
 #pragma warning(default : 4805)
 #pragma warning(default : 4005)
+#pragma warning(default : 4101)
 #endif
 
 #undef min
@@ -216,9 +224,56 @@ 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(MARIADDB_10_1)
+    return open_table(thd, tables, ot_act);
+#else
     return open_table(thd, tables, thd->mem_root, ot_act);
+#endif
 }
 #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 void cp_evaluate_insert_default_function(Field* fd)
+{
+#if (MYSQL_VERSION_ID > 50600)
+    Field* ft = fd;
+#else
+    Field_timestamp* ft = (Field_timestamp*)(fd);
+#endif
+    if (ft)
+        ft->set_time();
+}
+
+inline void cp_evaluate_update_default_function(Field* fd)
+{
+
+#if (MYSQL_VERSION_ID > 50600)
+    Field* ft = fd;
+#else
+    Field_timestamp* ft = (Field_timestamp*)(fd);
+#endif
+    if (ft)
+        ft->set_time();
+}
+
+inline unsigned char* cp_null_ptr(Field* fd, unsigned char* /*record*/)
+{
+    return (unsigned char*)fd->null_ptr;   
+}
+    
+
 #else
 
 
@@ -227,14 +282,12 @@ inline void cp_thd_release_resources(THD* thd)
     thd->release_resources();
 }
 
-inline void cp_set_mysys_var(st_my_thread_var* var)
-{
 #if(MYSQL_VERSION_NUM < 50700)
+inline void cp_set_mysys_var(struct st_my_thread_var* var)
+{
     set_mysys_var(var);
-#else
-	set_mysys_thread_var(var);
-#endif
 }
+#endif
 
 inline void cp_restore_globals(THD* thd)
 {
@@ -256,6 +309,33 @@ 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 void cp_evaluate_insert_default_function(Field* fd)
+{
+    fd->evaluate_insert_default_function();
+}
+
+inline void cp_evaluate_update_default_function(Field* fd)
+{
+    fd->evaluate_update_default_function();
+}
+
+inline unsigned char* cp_null_ptr(Field* fd, unsigned char* record)
+{
+    return fd->null_offset() + record;
+}
+
 #endif
 
 #if (MYSQL_VERSION_NUM < 50611)
@@ -485,16 +565,18 @@ inline bool cp_query_command(THD* thd, char* str)
    make_db_list function is not static, but it is not list in sql_show.h.  
 */
 
-#ifdef MARIADDB_10_0
+#if (defined(MARIADDB_10_0) || defined(MARIADDB_10_1))
     typedef Dynamic_array<LEX_STRING*> SQL_Strings;
+#if (!defined(MARIADDB_10_1))
     typedef struct st_lookup_field_values
     {
         LEX_STRING db_value, table_value;
         bool wild_db_value, wild_table_value;
     } LOOKUP_FIELD_VALUES;
-
+#endif
     extern int make_db_list(THD *thd, Dynamic_array<LEX_STRING*> *files,
                  LOOKUP_FIELD_VALUES *lookup_field_vals);
+
     inline int db_list(THD *thd, SQL_Strings *files)
     {
         LOOKUP_FIELD_VALUES lv;

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

@@ -99,12 +99,12 @@ void endThread()
     setStackaddr(0);
 }
 
-void waitForServerStart()
-{
-    mysql_mutex_lock(&LOCK_server_started);
-    while (!mysqld_server_started)
-        mysql_cond_wait(&COND_server_started, &LOCK_server_started);
-    mysql_mutex_unlock(&LOCK_server_started);
+void waitForServerStart()
+{
+    mysql_mutex_lock(&LOCK_server_started);
+    while (!mysqld_server_started)
+        mysql_cond_wait(&COND_server_started, &LOCK_server_started);
+    mysql_mutex_unlock(&LOCK_server_started);
 }
 
 int getTransactdIsolation()
@@ -136,10 +136,10 @@ THD* buildTHD()
     
     thd->thread_stack = reinterpret_cast<char*>(&thd);
     thd->store_globals();
-    assert(thd->mysys_var);
-	cp_set_mysys_var(thd->mysys_var);
-    thd->system_thread = NON_SYSTEM_THREAD;
+	thd->system_thread = NON_SYSTEM_THREAD;
 #ifndef MYSQL_578_LATER
+	assert(thd->mysys_var);
+	cp_set_mysys_var(thd->mysys_var);
     const NET v = { 0 };
     thd->net = v;
 #endif
@@ -168,11 +168,15 @@ THD* attachThd(THD* thd)
     else
     {
         initThread(thd);
+#ifndef MYSQL_578_LATER
         assert(thd->mysys_var);
+#endif
         if (curThd != thd)
         {
             thd->store_globals();
+#ifndef MYSQL_578_LATER
 			cp_set_mysys_var(thd->mysys_var);
+#endif
         }
     }
     return curThd;

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

@@ -22,6 +22,7 @@
 #include "groupQuery.h"
 #ifdef _DEBUG
 #include <iostream>
+#include <iomanip>
 #endif
 
 namespace bzs
@@ -35,6 +36,86 @@ namespace tdap
 namespace client
 {
 
+#ifdef _DEBUG
+
+/*
+ Print record set whole row like a mysql command line tool.
+*/
+template <class RS>
+class dumpRecordset
+{
+    std::vector<size_t> m_widths;
+    std::vector<std::ios::fmtflags> m_ailgns;
+
+    void cacheWidthAndAlign(RS& rs)
+    {
+        const fielddefs& fds = *rs.fieldDefs();
+        m_widths.clear();
+        m_widths.resize(fds.size());
+        m_ailgns.clear();
+        m_ailgns.resize(fds.size());
+
+        for (size_t col = 0; col < fds.size(); ++col)
+        {
+            m_widths[col] = std::max(_tcslen(fds[col].name()), m_widths[col]);
+            m_ailgns[col] = fds[col].isStringType() ? std::ios::left : std::ios::right;
+        }
+        for(size_t i = 0; i < rs.size(); ++i)
+        {
+            row& rec = rs[i];
+            for (size_t col = 0; col < fds.size(); ++col)
+                m_widths[col] = std::max(_tcslen(rec[col].c_str()), m_widths[col]);
+        }
+    }
+
+    std::_tstring makeLine()
+    {
+        std::_tstring s = _T("+");
+        for (size_t i = 0;i < m_widths.size(); ++i)
+        {
+            s += std::_tstring(m_widths[i] + 2, _T('-'));
+            s += _T('+');
+        }
+        s += _T("\n");
+        return s;
+    }
+
+    void printValue(size_t width, std::ios::fmtflags f, const _TCHAR* value)
+    {
+        std::tcout.setf(f, std::ios::adjustfield);
+        std::tcout << _T(" ")  << std::setw(width) << value << _T(" |");
+    }
+
+    const _TCHAR* value(const fielddef& fd) {return fd.name();}
+    const _TCHAR* value(const field& fd) {return fd.c_str();}
+
+    template <class T>
+    void printRecord(const T& coll)
+    {
+        std::tcout  << _T("|");
+        for (size_t col = 0; col < m_widths.size(); ++col)
+            printValue(m_widths[col], m_ailgns[col], value(coll[col]));
+        std::tcout << std::endl;
+    }
+public:
+    void operator()(RS& rs)
+    {
+        cacheWidthAndAlign(rs);
+        std::_tstring line = makeLine();
+        //header
+        std::tcout << line;
+        printRecord(*rs.fieldDefs());
+        std::tcout << line;
+
+        //field value
+        for(size_t i = 0; i < rs.size(); ++i)
+            printRecord(rs[i]);
+        std::tcout << line;
+    }
+};
+#endif
+
+
 struct sortDescription
 {
     short index;
@@ -595,21 +676,8 @@ public:
 #ifdef _DEBUG
     void dump()
     {
-        const fielddefs& fields = *fieldDefs();
-        for (int j = 0; j < (int)fields.size(); ++j)
-            std::tcout << fields[j].name() << _T("\t");
-        std::tcout << _T("\n");
-
-        for (int i = 0; i < (int)size(); ++i)
-        {
-            row& m = (operator[](i));
-            for (int j = 0; j < (int)m.size(); ++j)
-            {
-                std::tcout << m[(short)j].c_str() << _T("\t");
-                if (j == (int)m.size() - 1)
-                    std::tcout << _T("\n");
-            }
-        }
+        dumpRecordset<recordsetImple> dumpRs;
+        dumpRs(*this);
     }
 #endif
 };

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

@@ -85,19 +85,29 @@ uchar_td convFieldType(enum enum_field_types type, uint flags, bool binary,
             return ft_uinteger;
         return ft_integer;
     case MYSQL_TYPE_ENUM:
-        return ft_integer;
     case MYSQL_TYPE_SET:
+    case MYSQL_TYPE_BIT:
         return ft_uinteger;
     case MYSQL_TYPE_FLOAT:
     case MYSQL_TYPE_DOUBLE:
         return ft_float;
     case MYSQL_TYPE_DATE:
+	case MYSQL_TYPE_NEWDATE:
         return ft_mydate;
     case MYSQL_TYPE_TIME:
+#if(MYSQL_VERSION_ID > 50600)
+    case MYSQL_TYPE_TIME2:
+#endif
         return ft_mytime;
     case MYSQL_TYPE_DATETIME:
+#if(MYSQL_VERSION_ID > 50600)
+    case MYSQL_TYPE_DATETIME2:
+#endif
         return ft_mydatetime;
     case MYSQL_TYPE_TIMESTAMP:
+#if(MYSQL_VERSION_ID > 50600)
+    case MYSQL_TYPE_TIMESTAMP2:
+#endif
         return ft_mytimestamp;
     case MYSQL_TYPE_VARCHAR:
     case MYSQL_TYPE_VAR_STRING: //?
@@ -115,15 +125,16 @@ uchar_td convFieldType(enum enum_field_types type, uint flags, bool binary,
         if (flags & BINARY_FLAG)
             return ft_myblob;
         return ft_mytext;
-    default:
-        return unicode ? ft_wzstring : ft_zstring;
+    default: // MYSQL_TYPE_NEWDECIMAL MYSQL_TYPE_GEOMETRY
+        return unicode ? ft_wstring : ft_string;
     }
     return 0;
 }
 
 bool isUnicode(const CHARSET_INFO& cs)
 {
-    return (charsetIndex(cs.csname) == CHARSET_UTF16LE);
+    int index = charsetIndex(cs.csname);
+    return (index == CHARSET_UTF16LE) || (index == CHARSET_USC2);
 }
 
 bool isBinary(const CHARSET_INFO& cs)

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

@@ -236,7 +236,8 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define ft_myblob                       51
 #define ft_autoIncUnsigned              52
 #define ft_myfixedbinary                53
-
+#define ft_enum                         54
+#define ft_set                          55
 #define ft_nullindicator                255
 
 /** charset type number
@@ -503,7 +504,7 @@ struct handshale_t
  */
 #define C_INTERFACE_VER_MAJOR "2"//##1 Build marker! Don't remove
 #define C_INTERFACE_VER_MINOR "4"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "4"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "5"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -567,7 +568,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "4"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "4"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "5"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -584,6 +585,6 @@ struct handshale_t
 
 #define TRANSACTD_VER_MAJOR 2//##7 Build marker! Don't remove
 #define TRANSACTD_VER_MINOR 4//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 4//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 5//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/db/transactd/connManager.cpp

@@ -233,7 +233,7 @@ const connManager::records& connManager::getDefinedDatabaseList() const
             cp_security_ctx(thd)->skip_grants();
             SQL_Strings files;
             db_list(thd, &files);
-#ifdef MARIADDB_10_0
+#if defined(MARIADDB_10_0) || defined(MARIADDB_10_1)
             for (int i = 0; i < (int)files.elements(); ++i)
                 appenDbList(m_records, files.at(i));
 #else

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

@@ -23,6 +23,9 @@
 #pragma warn -8022
 #endif
 #include <boost/test/included/unit_test.hpp>
+#ifndef BOOST_TEST_MESSAGE
+#define BOOST_TEST_MESSAGE BOOST_MESSAGE
+#endif
 #if defined(__BCPLUSPLUS__)
 #pragma warn .8012
 #pragma warn .8022
@@ -410,7 +413,8 @@ void testVersion(database* db)
                 "mysql_server_Major = " << vv.versions[1].majorVersion);
             BOOST_CHECK_MESSAGE(
                 ((5 <= vv.versions[1].minorVersion) ||
-                 (0 == vv.versions[1].minorVersion)),
+                 (0 == vv.versions[1].minorVersion) ||
+                 (1 == vv.versions[1].minorVersion)),
                 "mysql_server_Miner = " << vv.versions[1].minorVersion);
             BOOST_CHECK_MESSAGE((int)'M' == (int)vv.versions[1].type,
                                 "mysql_server_Type = " << vv.versions[1].type);
@@ -2420,7 +2424,7 @@ void testLogin(database* db)
 #ifndef _UNICODE
         TCHAR buf[256];
         sprintf_s(buf, 256, "bad host db->stat()=%d", db->stat());
-        BOOST_MESSAGE(buf);
+        BOOST_TEST_MESSAGE(buf);
 #endif
     }
 
@@ -2750,7 +2754,7 @@ void doTestverField(table* tb, bool unicodeField, bool varCharField)
         bool f = string(tb->getFVAstr(1)) == string("0松本");
         BOOST_CHECK_MESSAGE(f, "Get Set A3");
         if (!f)
-            BOOST_MESSAGE(tb->getFVAstr(1));
+            BOOST_TEST_MESSAGE(tb->getFVAstr(1));
     }
     BOOST_CHECK_MESSAGE(string(tb->getFVAstr(2)) == string("68"), "Orverrun 2");
 
@@ -2845,13 +2849,13 @@ void testVarField(database* db)
     BOOST_CHECK_MESSAGE(0 == db->stat(), "open 1");
     table* tb = db->openTable(_T("user1"));
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable");
-    BOOST_MESSAGE("Start acp varchar");
+    BOOST_TEST_MESSAGE("Start acp varchar");
     doTestverField(tb, false, true);
     tb->release();
 
     tb = db->openTable(_T("user2"));
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable2");
-    BOOST_MESSAGE("Start acp varbinary");
+    BOOST_TEST_MESSAGE("Start acp varbinary");
     doTestverField(tb, false, false);
     tb->release();
 
@@ -2859,19 +2863,19 @@ void testVarField(database* db)
     {
         tb = db->openTable(_T("user3"));
         BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable3");
-        BOOST_MESSAGE("Start unicode varchar");
+        BOOST_TEST_MESSAGE("Start unicode varchar");
         doTestverField(tb, true, true);
         tb->release();
     }
     tb = db->openTable(_T("user4"));
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable4");
-    BOOST_MESSAGE("Start unicode varbinary");
+    BOOST_TEST_MESSAGE("Start unicode varbinary");
     doTestverField(tb, true, false);
     tb->release();
 
     tb = db->openTable(_T("user5"));
     BOOST_CHECK_MESSAGE(0 == db->stat(), "openTable5");
-    BOOST_MESSAGE("Start utf8 varchar");
+    BOOST_TEST_MESSAGE("Start utf8 varchar");
     doTestverField(tb, true, true);
 
     tb->release();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp