transactd 2.1.0 → 2.2.0

data/build/swig/tdcl.i

@@ -782,6 +782,91 @@ using namespace bzs::db::protocol::tdap::client;
 // * bzs/db/protocol/tdap/tdapcapi.h *
 %ignore BOOKMARK_ALLOC_SIZE;
 %ignore BTRV_MAX_DATA_SIZE;
+%ignore POS_BLOCK_SIZE;
+%ignore MAX_KEYLEN;
+%ignore TD_OPENTABLE;
+%ignore TD_CLOSETABLE;
+%ignore TD_REC_INSERT;
+%ignore TD_REC_UPDATE;
+%ignore TD_REC_DELETE;
+%ignore TD_KEY_SEEK;
+%ignore TD_KEY_NEXT;
+%ignore TD_KEY_PREV;
+%ignore TD_KEY_AFTER;
+%ignore TD_KEY_OR_AFTER;
+%ignore TD_KEY_BEFORE;
+%ignore TD_KEY_OR_BEFORE;
+%ignore TD_KEY_FIRST;
+%ignore TD_KEY_LAST;
+%ignore TD_CREATETABLE;
+%ignore TD_TABLE_INFO;
+%ignore TD_SETDIRECTORY;
+%ignore TD_GETDIRECTORY;
+%ignore TD_BEGIN_TRANSACTION;
+%ignore TD_END_TRANSACTION;
+%ignore TD_ABORT_TRANSACTION;
+%ignore TD_BOOKMARK;
+%ignore TD_MOVE_BOOKMARK;
+%ignore TD_POS_NEXT;
+%ignore TD_STOP_ENGINE;
+%ignore TD_VERSION;
+%ignore TD_UNLOCK;
+%ignore TD_RESET_CLIENT;
+%ignore TD_SET_OWNERNAME;
+%ignore TD_CLEAR_OWNERNAME;
+%ignore TD_BUILD_INDEX;
+%ignore TD_DROP_INDEX;
+%ignore TD_POS_FIRST;
+%ignore TD_POS_LAST;
+%ignore TD_POS_PREV;
+%ignore TD_KEY_NEXT_MULTI;
+%ignore TD_KEY_PREV_MULTI;
+%ignore TD_POS_NEXT_MULTI;
+%ignore TD_POS_PREV_MULTI;
+%ignore TD_INSERT_BULK;
+%ignore TD_BACKUPMODE;
+%ignore TD_MOVE_PER;
+%ignore TD_GET_PER;
+%ignore TD_UPDATE_PART;
+%ignore TD_KEY_EQUAL_KO;
+%ignore TD_KEY_NEXT_KO;
+%ignore TD_KEY_PREV_KO;
+%ignore TD_KEY_GT_KO;
+%ignore TD_KEY_GE_KO;
+%ignore TD_KEY_LT_KO;
+%ignore TD_KEY_LE_KO;
+%ignore TD_KEY_FIRST_KO;
+%ignore TD_KEY_LAST_KO;
+%ignore TD_CREATE_TEMP;
+%ignore TD_TABLE_INFO_EX;
+%ignore TD_REC_UPDATEATKEY;
+%ignore TD_REC_DELLETEATKEY;
+%ignore TD_KEY_GE_NEXT_MULTI;
+%ignore TD_KEY_LE_PREV_MULTI;
+%ignore TD_CONNECT;
+%ignore TD_BEGIN_SHAPSHOT;
+%ignore TD_END_SNAPSHOT;
+%ignore TD_AUTOMEKE_SCHEMA;
+%ignore TD_GETSERVER_CHARSET;
+%ignore TD_ADD_SENDBLOB;
+%ignore TD_GET_BLOB_BUF;
+%ignore TD_STASTISTICS;
+%ignore TD_KEY_SEEK_MULTI;
+%ignore CR_SUBOP_DROP;
+%ignore CR_SUBOP_RENAME;
+%ignore CR_SUBOP_SWAPNAME;
+%ignore CR_SUBOP_BY_FILESPEC;
+%ignore CR_SUBOP_BY_FILESPEC_NOCKECK;
+%ignore CR_SUBOP_BY_TABLEDEF;
+%ignore CR_SUBOP_BY_TABLEDEF_NOCKECK;
+%ignore CR_SUB_FLAG_EXISTCHECK;
+%ignore TD_ASBLOB_ENDROW;
+%ignore TD_STSTCS_READ;
+%ignore TD_STSTCS_DISCONNECT_ONE;
+%ignore TD_STSTCS_DISCONNECT_ALL;
+%ignore LG_SUBOP_CONNECT;
+%ignore LG_SUBOP_DISCONNECT;
+%ignore LG_SUBOP_NEWCONNECT;
 %ignore C_INTERFACE_VER_MAJOR;
 %ignore C_INTERFACE_VER_MINOR;
 %ignore C_INTERFACE_VER_RELEASE;
@@ -801,6 +886,9 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore TD_CPP_LIB_PRE;
 %ignore TD_FILTER_PREPARE;
 %ignore TD_LIB_PART;
+%ignore trdVersiton;
+%ignore handshale_t;
+%ignore MYSQL_SCRAMBLE_LENGTH;
 
 // * bzs/db/protocol/tdap/tdapSchema.h *
 %ignore DLLUNLOADCALLBACK_PTR;

data/build/tdclc/CMakeLists.txt

@@ -132,7 +132,11 @@ if(CAN_LINK_ICONV)
 endif()
 if(NOT MSVC)
   target_link_libraries(${this_target} pthread)
-  target_link_libraries(${this_target} -Wl,--version-script,"${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    ## target_link_libraries(${this_target} "${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
+  else()
+    target_link_libraries(${this_target} -Wl,--version-script,"${TRANSACTD_ROOT}/build/tdclc/libtdclcm.map")
+  endif()
 endif()
 
 

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_1</DllSuffix>
+        <DllSuffix>_2_2</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,1,0,10
- PRODUCTVERSION 2,1,0,10
+ FILEVERSION 2,2,0,10
+ PRODUCTVERSION 2,2,0,10
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.1.0.10"
+            VALUE "FileVersion", "2.2.0.10"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.1.0.10"
+            VALUE "ProductVersion", "2.2.0.10"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

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

data/build/tdclcpp/tdclcpp_bc.cbproj

@@ -152,7 +152,7 @@
         <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <TD_VER_MAJOR>2</TD_VER_MAJOR>
-        <TD_VER_MINOR>1</TD_VER_MINOR>
+        <TD_VER_MINOR>2</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 2,1,0,10
- PRODUCTVERSION 2,1,0,10
+ FILEVERSION 2,2,0,10
+ PRODUCTVERSION 2,2,0,10
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "2.1.0.10"
+            VALUE "FileVersion", "2.2.0.10"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.1.0.10"
+            VALUE "ProductVersion", "2.2.0.10"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -53,8 +53,6 @@ using namespace std;
 #error "MODE_READ_EXCLUSIVE != TD_OPEN_READONLY_EXCLUSIVE"
 #endif
 
-
-
 unsigned int hash(const char* s, size_t len)
 {
     unsigned int h = 0;
@@ -155,7 +153,6 @@ thr_lock_type locktype(bool trn, enum_sql_command cmd)
     return lock_type;
 }
 
-
 bool unlockTables(bool releaseStatementLock, THD* thd, bool rollback, database::tableList* tables)
 {
     if (thd->lock)
@@ -171,7 +168,6 @@ bool unlockTables(bool releaseStatementLock, THD* thd, bool rollback, database::
         {
             for (size_t i=0;i<tables->size();++i)
                 mysql_lock_remove(thd, thd->lock, (*tables)[i]->internalTable());
-
         }else
         {
             mysql_unlock_tables(thd, thd->lock);
@@ -191,7 +187,7 @@ tableCacheCounter database::tableRef;
 database::database(const char* name, short cid)
     : m_dbname(name), m_thd(createThdForThread()), 
       m_inTransaction(0), m_inSnapshot(0), m_stat(0), m_usingExclusive(false),
-      m_inAutoTransaction(NULL), m_trnType(0), m_cid(cid)
+      m_inAutoTransaction(NULL), m_trnType(0), m_cid(cid), m_privilege(0xFFFF)
 {
     m_thd->security_ctx->skip_grants();
 }
@@ -209,6 +205,97 @@ database::~database()
     deleteThdForThread(m_thd);
 }
 
+unsigned char* database::getUserSha1Passwd(const char* host, const char* user,
+                                            unsigned char* buf)
+{
+    table* tb2 = NULL;
+    table* tb = NULL;
+    unsigned char* retPtr = NULL;
+    std::string dbname = m_dbname;
+    m_dbname = "mysql";
+    try
+    {
+        use();
+        tb2 = openTable("user", TD_OPEN_READONLY, "");
+        if (tb2)
+        {
+	        tb = useTable(tb2->id(), SQLCOM_SELECT, NULL);
+	        if (tb)
+	        {
+	            tb->setKeyNum((char)0);
+	            std::vector<std::string> keyValues;
+	            keyValues.push_back(host);
+	            keyValues.push_back(user);
+	            tb->setKeyValues(keyValues, -1, NULL);
+	            tb->seekKey(HA_READ_KEY_EXACT, tb->keymap());
+	            if (tb->stat() == 0)
+	            {
+	                int size;
+	                const char* p =  tb->valStr(MYSQL_USER_FIELD_PASSWORD, size);
+	                if (strlen(p))
+	                {
+	                    get_salt_from_password(buf, p);
+	                    retPtr = buf;
+	                }
+	            }
+	            tb->unUse();
+	        }
+            closeTable(tb2);
+        }
+        m_dbname = dbname;
+        return retPtr;
+    }
+    catch (...)
+    {
+    }
+    if (tb)
+        tb->unUse();
+    if (tb2)
+        closeTable(tb2);
+    m_dbname = dbname;
+    return retPtr;
+}
+
+
+// true ok false fail
+bool database::setGrant(const char* host, const char* user)
+{
+    bool ret =  (acl_getroot(m_thd->security_ctx, my_strdup(user, MYF(0)), 
+           my_strdup(host, MYF(0)), my_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);
+                
+    return ret;
+}
+
+// for mysql database only
+short database::aclReload()
+{
+    if (name() != "mysql")
+        return STATUS_ACCESS_DENIED;
+    if(!(m_privilege & GRANT_ACL))
+        return STATUS_ACCESS_DENIED;
+    short ret = STATUS_SUCCESS;
+
+    THD* thdCur = _current_thd();
+    THD* thd = NULL;
+    try
+    {
+        thd = createThdForThread();
+        attachThd(thd);
+        thd->clear_error();
+        acl_reload(thd);
+    }
+    catch (...)
+    {
+        ret = 1;
+    }
+    if (thd)
+        deleteThdForThread(thd);
+    attachThd(thdCur);
+    return ret;
+}
+
 void database::use() const
 {
     attachThd(m_thd);
@@ -304,6 +391,24 @@ void database::changeIntentionLock(table* tb, thr_lock_type lock_type)
     }
 }
 
+inline void database::checkACL(enum_sql_command cmd)
+{
+    switch(cmd)
+    {
+    case SQLCOM_UPDATE: 
+        if (!(m_privilege & UPDATE_ACL)) THROW_BZS_ERROR_WITH_CODE(STATUS_ACCESS_DENIED); 
+        break;             
+    case SQLCOM_INSERT: 
+        if (!(m_privilege & INSERT_ACL)) THROW_BZS_ERROR_WITH_CODE(STATUS_ACCESS_DENIED); 
+        break;             
+    case SQLCOM_DELETE: 
+        if (!(m_privilege & DELETE_ACL)) THROW_BZS_ERROR_WITH_CODE(STATUS_ACCESS_DENIED); 
+        break;
+    default:
+        break;
+    }
+}
+
 /*
 How to set the lock value to InnoDB prebuilt->select_lock_type variable.
 
@@ -331,7 +436,7 @@ table* database::useTable(int index, enum_sql_command cmd, rowLockMode* lck)
 {
     if (index >= (int)m_tables.size())
         THROW_BZS_ERROR_WITH_CODEMSG(1, "Invalid table id.");
-
+                                     
     table* tb = m_tables[index].get();
     if (tb == NULL)
         THROW_BZS_ERROR_WITH_CODEMSG(STATUS_FILE_NOT_OPENED,
@@ -362,9 +467,7 @@ table* database::useTable(int index, enum_sql_command cmd, rowLockMode* lck)
         return tb;
     }
 
-    if (tb->m_table == NULL)
-        THROW_BZS_ERROR_WITH_CODEMSG(STATUS_FILE_NOT_OPENED,
-                                     "Invalid table id.");
+    checkACL(cmd);
     prebuildLocktype(tb, cmd, lck);
     
     if (m_thd->lock == 0)
@@ -572,6 +675,12 @@ 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)))
+    {
+        m_stat = STATUS_ACCESS_DENIED;
+        return NULL;
+    }
     tables.mdl_request.set_type(MDL_SHARED_READ);
 
     Open_table_context ot_act(m_thd, MYSQL_OPEN_GET_NEW_TABLE);
@@ -581,9 +690,9 @@ TABLE* database::doOpenTable(const std::string& name, short mode,
         m_stat = STATUS_TABLE_NOTOPEN;
         if (ER_LOCK_WAIT_TIMEOUT == m_thd->cp_get_sql_error())
             m_stat = STATUS_CANNOT_LOCK_TABLE;
-        THROW_BZS_ERROR_WITH_CODEMSG(m_stat, name.c_str());
+        return NULL;
     }
-
+    
     // Check owner name
     if (ownerName && ownerName[0])
     {
@@ -608,31 +717,26 @@ TABLE* database::doOpenTable(const std::string& name, short mode,
     sprintf(buf, "%d", tables.table->field[1]->key_length());
     OutputDebugString(buf);
 #endif
+    m_stat = STATUS_SUCCESS;
     return tables.table;
 }
 
 table* database::openTable(const std::string& name, short mode,
                            const char* ownerName)
 {
-    if (existsTable(name))
+    TABLE* t = doOpenTable(name, mode, ownerName);
+    if (t)
     {
-
-        TABLE* t = doOpenTable(name, mode, ownerName);
-        if (t)
-        {
-            boost::shared_ptr<table> tb(
-                new table(t, *this, name, mode, (int)m_tables.size()));
-            m_tables.push_back(tb);
-            m_stat = STATUS_SUCCESS;
-            if (tb->isExclusveMode())
-                ++m_usingExclusive;
-            tableRef.addref(m_dbname, name); // addef first then table open.
-            return tb.get();
-        }
-        return NULL;
+        boost::shared_ptr<table> tb(
+            new table(t, *this, name, mode, (int)m_tables.size()));
+        m_tables.push_back(tb);
+        m_stat = STATUS_SUCCESS;
+        if (tb->isExclusveMode())
+            ++m_usingExclusive;
+        tableRef.addref(m_dbname, name); // addef first then table open.
+        return tb.get();
     }
-    m_stat = STATUS_TABLE_NOTOPEN;
-    THROW_BZS_ERROR_WITH_CODEMSG(m_stat, name.c_str());
+    return NULL;
 }
 
 void database::closeTable(const std::string& name, bool drop)
@@ -685,8 +789,15 @@ void database::closeTable(table* tb)
             }else
                 m_tables[i]->unUse();
             
-            m_tables[i].reset();
+            m_tables[i]->m_table->file->ha_index_or_rnd_end();
 
+            TABLE** tbl;
+            for (tbl= &m_thd->open_tables; *tbl; tbl= &((*tbl)->next))
+                if(*tbl == m_tables[i]->m_table)
+                    break;
+            if (*tbl)
+                close_thread_table(m_thd, tbl);
+            m_tables[i].reset();
             DEBUG_WRITELOG_SP1("CLOSE TABLE table id=%d \n", i);
         }
     }
@@ -725,31 +836,12 @@ void database::reopen()
     }
 }
 
-bool database::existsTable(const std::string& name)
-{
-    char tmp[FN_REFLEN + 1];
-
-    build_table_filename(tmp, sizeof(tmp) - 1, m_dbname.c_str(), name.c_str(),
-                         reg_ext, 0);
-    MY_STAT st;
-    if (mysql_file_stat(0, tmp, &st, MYF(0)))
-        return true;
-    return false;
-}
-
 bool database::existsDatabase()
 {
-    char tmp[FN_REFLEN + 1];
-    size_t len =
-        build_table_filename(tmp, sizeof(tmp) - 1, m_dbname.c_str(), "", "", 0);
-    tmp[len - 1] = 0x00;
-
-    MY_STAT stat;
-    if (mysql_file_stat(0, tmp, &stat, MYF(0)))
-        return true;
-    return false;
+    return !check_db_dir_existence(m_dbname.c_str());
 }
 
+
 class autoincSetup
 {
     TABLE* m_table;
@@ -776,7 +868,6 @@ unsigned short nisFieldNum(TABLE* tb)
                 return (unsigned short)(tb->s->fields - i - offset);
         return tb->s->fields;
     }
-
     return 0;
 }
 
@@ -1058,8 +1149,8 @@ void* table::record() const
 }
 
 /** if offset and lastVarLenBytes() is non zero that is
- * m_recordFormatType=RF_FIXED_PLUS_VALIABLE_LEN.
- *  ptr is excluding null flag sgement.
+  �@m_recordFormatType=RF_FIXED_PLUS_VALIABLE_LEN.
+    ptr is excluding null flag sgement.
  */
 void table::setRecord(void* ptr, unsigned short size, int offset)
 {
@@ -2290,6 +2381,27 @@ uint table::makeBlobFieldList(int fieldNum)
     return count;
 }
 
+inline void setSegmentValue(const KEY_PART_INFO& segment, const std::string& v)
+{
+    segment.field->set_notnull();
+    if (!((v.size() == 1) && (v[0] == 0x00)))
+        segment.field->store(v.c_str(), (uint)v.size(), &my_charset_bin);
+    else
+        segment.field->set_null();
+}
+
+void table::setKeyValues(const std::vector<std::string>& values, int keypart,
+                         const std::string* inValue)
+{
+    KEY& key = m_table->key_info[m_keyNum];
+    for (int i = 0; i < (int)key.user_defined_key_parts; i++)
+        if (i < (int)values.size())
+            setSegmentValue(key.key_part[i], values[i]);
+    if (keypart != -1)
+        setSegmentValue(key.key_part[keypart], *inValue);
+    key_copy(&m_keybuf[0], m_table->record[0], &key, KEYLEN_ALLCOPY);
+}
+
 #ifdef USE_HANDLERSOCKET
 
 int table::fieldIndexByName(const char* name) const
@@ -2312,27 +2424,6 @@ void table::setUseFieldList(const std::string& csv)
         addUseField(fieldIndexByName(values[i].c_str()));
 }
 
-inline void setSegmentValue(const KEY_PART_INFO& segment, const std::string& v)
-{
-    segment.field->set_notnull();
-    if (!((v.size() == 1) && (v[0] == 0x00)))
-        segment.field->store(v.c_str(), (uint)v.size(), &my_charset_bin);
-    else
-        segment.field->set_null();
-}
-
-void table::setKeyValues(const std::vector<std::string>& values, int keypart,
-                         const std::string* inValue)
-{
-    KEY& key = m_table->key_info[m_keyNum];
-    for (int i = 0; i < (int)key.user_defined_key_parts; i++)
-        if (i < (int)values.size())
-            setSegmentValue(key.key_part[i], values[i]);
-    if (keypart != -1)
-        setSegmentValue(key.key_part[keypart], *inValue);
-    key_copy(&m_keybuf[0], m_table->record[0], &key, KEYLEN_ALLCOPY);
-}
-
 void table::setValue(int index, const std::string& v, int type)
 {
     Field* field = *(m_table->field + index);

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

@@ -119,6 +119,7 @@ private:
     short m_cid;
     enum_tx_isolation m_iso;
     tableList m_tables;
+    ulong m_privilege;
    
     TABLE* doOpenTable(const std::string& name, short mode,
                                 const char* ownerName);
@@ -128,12 +129,16 @@ private:
     void prebuildExclusieLockMode(table* tb);
     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);
 public:
     
 
     database(const char* name, short cid);
     ~database();
+    bool setGrant(const char* host, const char* user);
+
+    unsigned char* getUserSha1Passwd(const char* host, const char* user,
+        unsigned char* buf);
 
     int stat() { return m_stat; }
 
@@ -163,7 +168,6 @@ public:
     bool beginTrn(short type, enum_tx_isolation iso);
     bool commitTrn();
     bool abortTrn();
-    bool existsTable(const std::string& name);
     bool existsDatabase();
     void closeTable(const std::string& name, bool drop);
     void closeTable(table* tb);
@@ -185,7 +189,10 @@ public:
         return ((m_inSnapshot + m_inTransaction) == 0);
     }
 
+    short aclReload();
+
     static tableCacheCounter tableRef;
+
 };
 
 typedef std::vector<boost::shared_ptr<database> > databases;
@@ -194,7 +201,8 @@ class IReadRecordsHandler;
 class IPrepare;
 class bookmarks;
 
-
+//unsigned char* getUserSha1Passwd(const char* host, const char* user, unsigned char* buf);
+//short aclReload();
 /*
  *  Since it differs from the key number which a client specifies
  *   , and an internal key number, it changes.
@@ -323,8 +331,6 @@ class table : private boost::noncopyable
 public:
     std::vector<int>& useFields() { return m_useFields; };
     void setUseFieldList(const std::string& csv);
-    void setKeyValues(const std::vector<std::string>& values, int keypart,
-                      const std::string* inValue = NULL);
     void setValue(int index, const std::string& v, int type);
     void setUseValues(const std::vector<std::string>& values, int type);
 
@@ -547,6 +553,11 @@ public:
         return m_table->field[fieldNum]->type();
     }
 
+    inline enum enum_field_types fieldRealType(int fieldNum) const
+    {
+        return m_table->field[fieldNum]->real_type();
+    }
+
     inline unsigned int fieldFlags(int fieldNum) const
     {
         return m_table->field[fieldNum]->flags;
@@ -700,6 +711,9 @@ public:
             m_validCursor = false;
         }
     }
+    void setKeyValues(const std::vector<std::string>& values, int keypart,
+                    const std::string* inValue = NULL);
+
     
 };