transactd 2.3.0 → 2.4.0

data/build/swig/tdcl.i

@@ -263,9 +263,9 @@ using namespace bzs::db::protocol::tdap::client;
     g_vPtrList.add(p->table().get());
     return p;
   }
-  activeTable(database* db, const _TCHAR* tableName) {
+  activeTable(database* db, const _TCHAR* tableName, short mode) {
     bzs::db::protocol::tdap::client::activeTable* p =
-      bzs::db::protocol::tdap::client::activeTable::create(db, tableName);
+      bzs::db::protocol::tdap::client::activeTable::create(db, tableName, mode);
     g_vPtrList.add(p->table().get());
     return p;
   }
@@ -663,6 +663,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::table::setMra;
 %ignore bzs::db::protocol::tdap::client::table::setFVA;
 %ignore bzs::db::protocol::tdap::client::table::getFVAstr;
+%ignore bzs::db::protocol::tdap::client::table::insertBookmarks;
 
   // create and release methods for query class
 %extend bzs::db::protocol::tdap::client::query {
@@ -760,6 +761,11 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::insertKey;
 %ignore bzs::db::protocol::tdap::client::insertRecord;
 %ignore bzs::db::protocol::tdap::client::insertTable;
+%ignore bzs::db::protocol::tdap::client::deleteTable
+%ignore bzs::db::protocol::tdap::client::renumberTable
+%ignore bzs::db::protocol::tdap::client::deleteField
+%ignore bzs::db::protocol::tdap::client::deleteKey
+%ignore bzs::db::protocol::tdap::client::validateTableDef
 %ignore bzs::db::protocol::tdap::client::isSameUri;
 %ignore bzs::db::protocol::tdap::client::lexical_cast;
 %ignore bzs::db::protocol::tdap::client::openDatabase;
@@ -807,6 +813,9 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::mraResetter;
 
 // * bzs/db/protocol/tdap/tdapcapi.h *
+#ignore BOOKMARK::val;
+#ignore BOOKMARK::empty;
+#ignore MAX_BOOKMARK_SIZE
 %ignore BOOKMARK_ALLOC_SIZE;
 %ignore BTRV_MAX_DATA_SIZE;
 %ignore POS_BLOCK_SIZE;
@@ -879,6 +888,8 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore TD_GET_BLOB_BUF;
 %ignore TD_STASTISTICS;
 %ignore TD_KEY_SEEK_MULTI;
+%ignore TD_ACL_RELOAD;
+%ignore TD_RECONNECT;
 %ignore CR_SUBOP_DROP;
 %ignore CR_SUBOP_RENAME;
 %ignore CR_SUBOP_SWAPNAME;
@@ -891,9 +902,18 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore TD_STSTCS_READ;
 %ignore TD_STSTCS_DISCONNECT_ONE;
 %ignore TD_STSTCS_DISCONNECT_ALL;
+%ignore TD_STSTCS_DATABASE_LIST;
+%ignore TD_STSTCS_SYSTEM_VARIABLES;
+%ignore TD_STSTCS_SCHEMA_TABLE_LIST;
 %ignore LG_SUBOP_CONNECT;
 %ignore LG_SUBOP_DISCONNECT;
 %ignore LG_SUBOP_NEWCONNECT;
+%ignore LG_SUBOP_RECONNECT;
+%ignore LG_SUBOP_DISCONNECT_EX;
+%ignore CMPLOGICAL_VAR_COMP_ALL;
+%ignore CMPLOGICAL_CMPACS;
+%ignore CMPLOGICAL_FIELD;
+%ignore CMPLOGICAL_CASEINSENSITIVE;
 %ignore C_INTERFACE_VER_MAJOR;
 %ignore C_INTERFACE_VER_MINOR;
 %ignore C_INTERFACE_VER_RELEASE;

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>_2_3</DllSuffix>
+        <DllSuffix>_2_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 2,3,0,11
- PRODUCTVERSION 2,3,0,11
+ FILEVERSION 2,4,0,66
+ PRODUCTVERSION 2,4,0,66
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.3.0.11"
+            VALUE "FileVersion", "2.4.0.66"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.3.0.11"
+            VALUE "ProductVersion", "2.4.0.66"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -15,6 +15,7 @@
         <BCVER Condition="'$(ProductVersion)'&gt;='12.0' and '$(ProductVersion)' &lt; '13.0'">190</BCVER>
         <BCVER Condition="'$(ProductVersion)'&gt;='14.0' and '$(ProductVersion)' &lt; '15.0'">200</BCVER>
         <BCVER Condition="'$(ProductVersion)'&gt;='15.0' and '$(ProductVersion)' &lt; '16.0'">210</BCVER>
+        <BCVER Condition="'$(ProductVersion)'&gt;='16.0' and '$(ProductVersion)' &lt; '17.0'">220</BCVER>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -152,7 +153,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>2</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/CMakeLists.txt

@@ -152,7 +152,12 @@ else()
   if(MSVC)
     target_link_libraries(${this_target} "tdclcppmr")
   else()
-    target_link_libraries(${this_target} "tdclcppm")
+    if(NOT TRANSACTD_WITHOUT_C_CPP_CLIENTS)
+      target_link_libraries(${this_target} "tdclcppm")
+    else()
+      transactd_link_boost_libraries("timer;filesystem;thread;chrono;system")
+      target_link_libraries(${this_target} "tdclcpp_64m")
+    endif()
   endif()
 endif()
 

data/build/tdclrb/bldgem/extconf.rb

@@ -56,6 +56,7 @@ ruby_library_path = arg_config('--ruby_library_path', '').gsub(/"\n/, '')
 install_prefix    = arg_config('--install_prefix', '').gsub(/"\n/, '')
 build_type        = arg_config('--build_type', '').gsub(/"\n/, '')
 no_rb_tbr         = arg_config('--without_rb_thread_blocking_region', '').gsub(/"\n/, '').downcase
+no_c_cpp          = arg_config('--without_c_cpp_clients')
 
 # boost
 if boost != '' && boost !=~ /^\-DBOOST_ROOT/
@@ -121,10 +122,13 @@ rb_tbr = ' -DTRANSACTD_HAVE_RB_THREAD_CALL_WITHOUT_GVL=' +
   ' -DTRANSACTD_HAVE_RB_THREAD_BLOCKING_REGION=' +
   (use_TBR ? 'ON' : 'OFF')
 
+# no_c_cpp
+no_c_cpp = no_c_cpp ? ' -DTRANSACTD_WITHOUT_C_CPP_CLIENTS=ON' : ''
+
 # cmake
 cmake_cmd = ['cmake', to_native_path(transactd_gem_root_relative), '-DTRANSACTD_RUBY_GEM=ON',
               generator, boost, ruby_executable, ruby_library_path, ruby_include_dirs,
-              install_prefix, gem_root, build_type, rb_tbr, '>> cmake_generate.log'].join(' ')
+              install_prefix, gem_root, build_type, rb_tbr, no_c_cpp, '>> cmake_generate.log'].join(' ')
 begin
   f = open('cmake_generate.log', 'w')
   f.puts cmake_cmd

data/build/tdclrb/tdclrb.rc

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

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

@@ -92,7 +92,6 @@ void tableCacheCounter::addref(const std::string& dbname,
                                const std::string& tbname)
 {
 
-    boost::mutex::scoped_lock lck(m_mutex);
     size_t pos = getCounterIndex(dbname, tbname);
     ++m_counts[pos];
 }
@@ -108,7 +107,6 @@ int tableCacheCounter::count(const std::string& dbname,
 void tableCacheCounter::release(const std::string& dbname,
                                 const std::string& tbname)
 {
-    boost::mutex::scoped_lock lck(m_mutex);
     size_t pos = getCounterIndex(dbname, tbname);
     --m_counts[pos];
 }
@@ -202,7 +200,15 @@ database::~database()
     use();
     unUseTables(true/*rollback*/);
     closeForReopen();
-    m_tables.clear(); // It clears ahead of the destructor of m_trn.
+    {
+        boost::mutex::scoped_lock lck(tableRef.mutex());
+        for (size_t i = 0 ; i < m_tables.size(); ++i)
+        {
+            if (m_tables[i])
+                database::tableRef.release(name(), m_tables[i]->m_name);
+        }
+        m_tables.clear(); // It clears ahead of the destructor of m_trn.
+    }
     deleteThdForThread(m_thd);
 }
 
@@ -459,7 +465,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)
+    if (tb->m_blobBuffer && tb->blobFields())
         tb->m_blobBuffer->clear();
 
     // Change to shared lock is user tranasction only.
@@ -718,7 +724,10 @@ TABLE* database::doOpenTable(const std::string& name, short mode,
         if (ER_LOCK_WAIT_TIMEOUT == m_thd->cp_get_sql_error())
             m_stat = STATUS_CANNOT_LOCK_TABLE;
         else
+        {
+            m_stat = m_thd->cp_get_sql_error();
             cp_open_error_release(m_thd, tables);
+        }
         return NULL;
     }
 	cp_set_transaction_duration_for_all_locks(m_thd);
@@ -764,11 +773,15 @@ table* database::openTable(const std::string& name, short mode,
     {
         boost::shared_ptr<table> tb(
             new table(t, *this, name, mode, (int)m_tables.size()));
-        m_tables.push_back(tb);
+        {
+            boost::mutex::scoped_lock lck(tableRef.mutex());
+            m_tables.push_back(tb);
+            tableRef.addref(m_dbname, name); // addef first then table open.
+        }
         m_stat = STATUS_SUCCESS;
         if (tb->isExclusveMode())
             ++m_usingExclusive;
-        tableRef.addref(m_dbname, name); // addef first then table open.
+        
         return tb.get();
     }
     return NULL;
@@ -832,12 +845,19 @@ void database::closeTable(table* tb)
                     break;
             if (*tbl)
                 close_thread_table(m_thd, tbl);
-            m_tables[i].reset();
+            releaseTable(i);
             DEBUG_WRITELOG_SP1("CLOSE TABLE table id=%d \n", i);
         }
     }
 }
 
+void database::releaseTable(size_t index)
+{
+    boost::mutex::scoped_lock lck(database::tableRef.mutex());
+    database::tableRef.release(name(), m_tables[index]->m_name);
+    m_tables[index].reset();
+}
+
 void database::closeForReopen()
 {
     // A transaction is committed compulsorily.
@@ -864,7 +884,7 @@ void database::reopen()
             if (table)
                 m_tables[i]->resetInternalTable(table);
             else
-                m_tables[i].reset();
+                releaseTable(i);
         }
     }
 }
@@ -910,7 +930,7 @@ table::table(TABLE* myTable, database& db, const std::string& name, short mode,
              int id)
     : m_table(myTable), m_name(name), m_mode(mode), m_id(id), m_db(db),
       m_keybuf(new unsigned char[MAX_KEYLEN]),
-      m_nonNccKeybuf(new unsigned char[MAX_KEYLEN]), m_stat(0),
+      m_stat(0),
       m_keyconv(m_table->key_info, m_table->s->keys), m_blobBuffer(NULL), 
       m_readCount(0), m_updCount(0), m_delCount(0), m_insCount(0),
       m_keyNum(-1), m_nonNcc(false), m_validCursor(true), m_cursor(false), 
@@ -968,7 +988,6 @@ table::table(TABLE* myTable, database& db, const std::string& name, short mode,
 table::~table()
 {
     resetInternalTable(NULL);
-    database::tableRef.release(m_db.name(), m_name);
     for (size_t i = 0; i < preparedStatements.size(); ++i)
         preparedStatements[i]->release();
 }
@@ -987,7 +1006,6 @@ void table::resetTransctionInfo(THD* thd)
         m_locked = false;
     m_validCursor = false;
     m_nounlock = false;
-    m_readCount = m_updCount = m_delCount = m_insCount = 0;
 }
 
 void table::resetInternalTable(TABLE* table)
@@ -1098,13 +1116,13 @@ short table::setKeyValuesPacked(const uchar* ptr, int size)
         KEY_PART_INFO& seg = key.key_part[j];
         if (seg.null_bit)
         {
-            m_keybuf[to++] = 0x00;
-            seg.field->set_notnull();
+            m_keybuf[to++] = 0x00;   // set null to mysql null indicator. 
+            seg.field->set_notnull();// Ignore null for read.
         }
         if (seg.null_bit && isNisField(seg.field->field_name))
         {
-            m_keybuf[to++] = 0x00;
-            seg.field->set_notnull();
+            m_keybuf[to++] = 0x00; // set null to nis field. 
+            //continue next segment
         }
         else
         {
@@ -1793,6 +1811,7 @@ void table::stepFirst()
     }
     else
     {
+        m_keyNum = -1;
         if (setNonKey(true))
         {
             unlockRow(m_delayAutoCommit);
@@ -2068,11 +2087,7 @@ bool table::isNisKey(char num) const
     if ((num >= 0) && (num < (short)m_table->s->keys))
     {
         Field* fd = m_table->key_info[num].key_part[0].field;
-        // Nis is only in a head segment.
-        if (isNisField(fd->field_name))
-            return true;
-        else if ((fd->pack_length() == 1) && (fd->type() == MYSQL_TYPE_TINY) &&
-                 fd->null_bit)
+        if (fd->null_bit)
             return true;
     }
     return false;
@@ -2160,9 +2175,6 @@ __int64 table::insert(bool ncc)
 
     {
         autoincSetup setup(m_table);
-        if (!ncc)
-            key_copy(&m_nonNccKeybuf[0], m_table->record[1],
-                     &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
         setKeyNullFlags();
         setFiledNullFlags();
 
@@ -2179,9 +2191,9 @@ __int64 table::insert(bool ncc)
     if (m_stat == 0)
     {
         ++m_insCount;
-        if (!ncc) // innodb default is ncc=-1.
-            m_nonNcc = true;
-        else if (!m_bulkInserting)
+        // innodb default is ncc=-1.
+        m_nonNcc = !ncc;
+        if (!ncc && !m_bulkInserting)
             key_copy(&m_keybuf[0], m_table->record[0],
                      &m_table->key_info[m_keyNum], KEYLEN_ALLCOPY);
         
@@ -2199,15 +2211,10 @@ void table::beginUpdate(char keyNum)
     if (m_stat == 0)
     {
         if (keyNum >= 0)
-        {
-            key_copy(&m_nonNccKeybuf[0], m_table->record[0],
-                     &m_table->key_info[keyNum], KEYLEN_ALLCOPY);
-            setKeyNum(keyNum);
-        }
+           setKeyNum(keyNum);
         store_record(m_table, record[1]);
     }
 }
-
 void table::beginDel()
 {
     if ((m_mode == TD_OPEN_READONLY) || (m_table->reginfo.lock_type < TL_WRITE))
@@ -2278,14 +2285,11 @@ void table::update(bool ncc)
                     const KEY& key = m_table->key_info[m_keyNum];
                     key_copy(&m_keybuf[0], m_table->record[0], (KEY*)&key,
                              KEYLEN_ALLCOPY);
-                    if (memcmp(&m_nonNccKeybuf[0], &m_keybuf[0],
-                               key.key_length))
-                    {
-                        // Since the NULL key was set, a current position is
-                        // lost.
-                        if (nullFieldsOfCurrentKey == 0)
-                            m_nonNcc = true;
-                    }
+
+                    // Since the NULL key was set, a current position is
+                    // lost.
+                    if (nullFieldsOfCurrentKey == 0)
+                        m_nonNcc = true;
                 }
             }
             /* Do not change to m_changed = false */

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

@@ -73,9 +73,10 @@ namespace mysql
 /** bookmark size
  *  btreive API is MAX 4 byte
  */
-#define REF_SIZE_MAX 4
+#define REF_SIZE_MAX 112
 class table;
 
+
 /** Control mysql table cahche
  */
 class tableCacheCounter
@@ -93,6 +94,7 @@ public:
     void addref(const std::string& dbname, const std::string& tbname);
     int count(const std::string& dbname, const std::string& tbname);
     void release(const std::string& dbname, const std::string& tbname);
+    boost::mutex& mutex() { return m_mutex; }
 };
 
 struct rowLockMode
@@ -130,6 +132,7 @@ private:
     void prebuildLocktype(table* tb, enum_sql_command& cmd, rowLockMode* lck) ;
     void changeIntentionLock(table* tb, thr_lock_type lock_type);
     void checkACL(enum_sql_command cmd);
+    void releaseTable(size_t index);
 public:
     
 
@@ -153,6 +156,8 @@ public:
 
     short transactionType() const { return m_trnType; }
 
+    enum_tx_isolation transactionIsolation() const { return m_iso; }
+
     bool inSnapshot() const { return m_inSnapshot != 0; }
 
     const std::vector<boost::shared_ptr<table> >& tables() const
@@ -255,7 +260,6 @@ class table : private boost::noncopyable
 #endif
     database& m_db;
     mutable boost::scoped_array<unsigned char> m_keybuf;
-    mutable boost::scoped_array<unsigned char> m_nonNccKeybuf;
 
     int m_stat;
     int m_percentResult;
@@ -264,10 +268,10 @@ class table : private boost::noncopyable
     keynumConvert m_keyconv;
     IblobBuffer* m_blobBuffer;
     std::vector<Field*> m_nonKeySegNullFields;
-    int m_readCount;
-    int m_updCount;
-    int m_delCount;
-    int m_insCount;
+    unsigned int m_readCount;
+    unsigned int m_updCount;
+    unsigned int m_delCount;
+    unsigned int m_insCount;
     char m_keyNum;
     struct
     {
@@ -386,7 +390,7 @@ public:
 
     inline bool isChanged() { return m_changed; }
 
-    int id() { return m_id; };
+    int id() const { return m_id; };
 
     /* The singleRowLock is no effects with Transaction or Snapshot. */
     inline void unUse() 
@@ -473,6 +477,7 @@ public:
     {
         return (1U << m_table->key_info[m_keyNum].user_defined_key_parts) - 1;
     }
+    unsigned long long tableFlags() const { return m_table->file->ha_table_flags();}
     void seekKey(enum ha_rkey_function find_flag, key_part_map keyMap);
     void getNextSame(key_part_map keyMap);
     void getLast();
@@ -744,7 +749,13 @@ public:
     void setKeyValues(const std::vector<std::string>& values, int keypart,
                     const std::string* inValue = NULL);
 
-    
+    inline  unsigned int readCount() const { return m_readCount; }
+
+    inline  unsigned int updCount() const { return m_updCount; }
+
+    inline  unsigned int delCount() const { return m_delCount; }
+
+    inline  unsigned int insCount() const { return m_insCount; }
 };
 
 class fieldBitmap
@@ -875,6 +886,15 @@ struct smartForceConsistantRead
     }
 };
 
+
+class igetDatabases
+{
+public:
+    virtual ~igetDatabases(){};
+    virtual const databases& dbs() const = 0;
+    virtual boost::mutex& mutex() = 0;
+};
+
 #define BUILINSERT_SCOPE
 
 } // namespace mysql

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

@@ -192,6 +192,7 @@ database* dbManager::getDatabase(const char* dbname, short cid, bool& created) c
         if (db == NULL)
             THROW_BZS_ERROR_WITH_CODEMSG(1, "Can not create database object.");
         id = (int)m_dbs.size();
+        boost::mutex::scoped_lock lck(m_mutex);
         m_dbs.push_back(db);
         created = true;
     }
@@ -245,6 +246,7 @@ int dbManager::ddl_dropDataBase(THD* thd, const std::string& dbname,
     smartDbsReopen::removeName = dbname;
     int ret = ddl_execSql(thd, cmd);
     smartDbsReopen::removeName = "";
+    boost::mutex::scoped_lock lck(m_mutex);
     for (int i = (int)m_dbs.size() - 1; i >= 0; i--)
     {
         if (m_dbs[i] && (m_dbs[i]->name() == dbname))

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

@@ -105,14 +105,9 @@ public:
     virtual ~dbManager();
     bool isShutDown() const;
 
-    const databases& dbs() const { return m_dbs; };
-};
+    const databases& dbs() const { return m_dbs; }
 
-class igetDatabases
-{
-public:
-    virtual ~igetDatabases(){};
-    virtual const engine::mysql::databases& dbs() const = 0;
+    boost::mutex& mutex() { return m_mutex; }
 };
 
 } // namespace mysql