transactd 3.5.0 → 3.6.0

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

@@ -152,53 +152,61 @@ public:
         }
         if (P_MASK_PB_ERASE_BM & paramMask)
              pbk->bookmarkLen = 0; 
-
-        if (P_MASK_DATALEN & paramMask)
-        {
-            uint_td tmp = *((uint_td*)p);
-            if (*datalen < tmp)
-            {
-                result = STATUS_BUFFERTOOSMALL;
-                return ;
-            }
-            else
-                *datalen = tmp;
-            p += sizeof(uint_td);
-        }
-
-        /*if (P_MASK_FINALDATALEN & paramMask)
-        {
-            memset(data, 0, *datalen);
-            if (*datalen < segmentDataLen)
-                result = STATUS_BUFFERTOOSMALL;
-            else
-                *datalen = segmentDataLen;
-        }*/
-#ifdef USE_DATA_COMPRESS
-        if (P_MASK_USELZSS & paramMask)
+        
+        if (P_MASK_DB_AINC_VAL & paramMask)
         {
-            unsigned int compSize;
-            memcpy(&compSize, p, sizeof(unsigned int));
-            p += sizeof(unsigned int);
-            unsigned int decompSize = bzs::rtl::lzssDecode(p, data);
-            p += compSize;
+            autoIncPackInfo* ai = (autoIncPackInfo*)p;
+            memcpy(((char*)data) + ai->pos, &ai->value, ai->len);
         }
         else
-#endif
-        if (P_MASK_DATA & paramMask)
         {
-            if (ex)
+            if (P_MASK_DATALEN & paramMask)
             {
-                if (pbk->allocFunc && pbk->tb)
-                    data = pbk->allocFunc(pbk->tb, *datalen);
+                uint_td tmp = *((uint_td*)p);
+                if (*datalen < tmp)
+                {
+                    result = STATUS_BUFFERTOOSMALL;
+                    return ;
+                }
+                else
+                    *datalen = tmp;
+                p += sizeof(uint_td);
             }
-            memcpy(data, p, *datalen);
-            p += *datalen;
+
             /*if (P_MASK_FINALDATALEN & paramMask)
             {
-                memcpy(data, &rows, 2);
-                p += sizeof(unsigned int);
+                memset(data, 0, *datalen);
+                if (*datalen < segmentDataLen)
+                    result = STATUS_BUFFERTOOSMALL;
+                else
+                    *datalen = segmentDataLen;
             }*/
+    #ifdef USE_DATA_COMPRESS
+            if (P_MASK_USELZSS & paramMask)
+            {
+                unsigned int compSize;
+                memcpy(&compSize, p, sizeof(unsigned int));
+                p += sizeof(unsigned int);
+                unsigned int decompSize = bzs::rtl::lzssDecode(p, data);
+                p += compSize;
+            }
+            else
+    #endif
+            if (P_MASK_DATA & paramMask)
+            {
+                if (ex)
+                {
+                    if (pbk->allocFunc && pbk->tb)
+                        data = pbk->allocFunc(pbk->tb, *datalen);
+                }
+                memcpy(data, p, *datalen);
+                p += *datalen;
+                /*if (P_MASK_FINALDATALEN & paramMask)
+                {
+                    memcpy(data, &rows, 2);
+                    p += sizeof(unsigned int);
+                }*/
+            }
         }
         if (P_MASK_KEYBUF & paramMask)
         {

data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp

@@ -436,9 +436,8 @@ std::string& sqlBuilder::getKey(const tabledef* td, std::vector<std::string>& fd
         _ltoa_s(key.keyNumber, buf, 20, 10);     
     else
         _ltoa_s(index, buf, 20, 10);
-    if ((td->primaryKeyNum == index) &&
-        (fdl[key.segments[0].fieldNum] == "auto_id_field"))
-        s += " PRIMARY KEY ";
+    if (td->primaryKeyNum == index)
+        s += " PRIMARY KEY";
     else
     {
         if (key.segments[0].flags.bit0 == false)

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

@@ -211,6 +211,11 @@ class stringConverter
 {
     unsigned int m_codePage;
     unsigned int m_exec_codePage;
+    
+    inline bool isNotSameCodePage() const
+    {
+        return (m_codePage != m_exec_codePage);
+    }
 
 public:
     stringConverter(unsigned int src_codPage, unsigned int exec_codePage)
@@ -341,9 +346,17 @@ public:
         return size;
     }
 
-    inline bool isNeedConvert() const
+    template <typename store_type, typename T>
+    inline bool isNeedConvert()
     {
-        return (m_codePage != m_exec_codePage);
+        /* unicode field is no binary*/
+        bool forceUnicodeFrom = (typeid(WCHAR) == typeid(store_type) && (typeid(T) == typeid(char)));
+        bool notBinaryData = m_codePage != 0;
+        bool notSameUnicodeType = (typeid(T) != typeid(store_type));
+        bool charButNotSameCodepage = (isNotSameCodePage() && (typeid(T) == typeid(char)));
+        return forceUnicodeFrom || 
+               (notBinaryData && (notSameUnicodeType || charButNotSameCodepage));
+                        
     }
 };
 
@@ -540,9 +553,7 @@ void store(char* ptr, const T* data, const fielddef& fd, stringConverter* cv)
         strPtr[0] = 0x00;
     else
     {
-        // convert
-        if ((typeid(T) != typeid(store_type)) ||
-            (cv->isNeedConvert() && (typeid(T) == typeid(char))))
+        if (cv->isNeedConvert<store_type, T>())
             len = cv->convert(strPtr, maxlen, data, len);
         else
         {
@@ -585,6 +596,8 @@ template <class T> T* trim(T* src, T* end, int padChar)
 #pragma warn -8008
 #pragma warn -8066
 
+
+
 template <class _SF, typename store_type, typename T>
 const T* read(char* ptr, ::bzs::rtl::stringBuffer* strBufs, const fielddef& fd,
               stringConverter* cv, bool isTrimPadChar = false)
@@ -595,8 +608,7 @@ const T* read(char* ptr, ::bzs::rtl::stringBuffer* strBufs, const fielddef& fd,
     T* result = (T*)(ptr + offset);
     // convert
     size_t len;
-    if ((typeid(T) != typeid(store_type)) ||
-        (cv->isNeedConvert() && (typeid(T) == typeid(char))))
+    if (cv->isNeedConvert<store_type, T>())
     {
         len = dataLen(fd, (const uchar_td*)ptr) / sizeof(store_type);
         size_t olen =
@@ -637,8 +649,7 @@ char* blobStore(char* ptr, const T* data, const fielddef& fd,
                                                               : UINT_MAX;
     if (len != 0)
     {
-        if ((typeid(T) != typeid(char)) ||
-            (cv->isNeedConvert() && (typeid(T) == typeid(char))))
+        if (cv->isNeedConvert<char, T>())
         {
             maxlen = std::min<size_t>(maxlen, len * 2 * sizeof(T) + 1);
             p = new char[maxlen];
@@ -655,7 +666,7 @@ char* blobStore(char* ptr, const T* data, const fielddef& fd,
     memset(ptr, 0, fd.len);
     memcpy(ptr, &len, offset);
     if (p)
-        memcpy(ptr + offset, &(p), sizeof(char*));
+        memcpy(ptr + offset, &p, sizeof(char*));
     return p;
 }
 #pragma warn -8004
@@ -671,14 +682,19 @@ const T* readBlob(char* ptr, ::bzs::rtl::stringBuffer* strBufs,
         char** pc = (char**)(ptr + offset);
         size_t olen = len * 2 + 1;
         result = strBufs->getPtr<T>(olen);
-        if ((typeid(T) != typeid(char)) ||
-            (cv->isNeedConvert() && (typeid(T) == typeid(char))))
+        if (cv->isNeedConvert<char, T>())
+        {
             len = cv->revert(result, olen, *pc, len);
+            result[len] = 0x00;
+        }
         else if (((T*)(*pc))[len] != 0x00)
+        {
             memcpy(result, *pc, len);
+            result[len] = 0x00;
+        }
         else
             result = (T*)*pc;
-        result[len] = 0x00;
+        
 
     }else
     {

data/source/bzs/db/protocol/tdap/client/table.cpp

@@ -175,6 +175,7 @@ class recordCache
     unsigned int m_len;
     unsigned int m_unpackLen;
     unsigned int m_rowCount;
+    unsigned int m_invalidRows;
     uchar_td* m_bookmark;
     uchar_td* m_ptr;
     uchar_td* m_tmpPtr;
@@ -192,6 +193,7 @@ public:
     {
         m_filter = NULL;
         m_row = 0;
+        m_invalidRows = 0;
         m_rowCount = 0;
         m_ptr = NULL;
         m_len = 0;
@@ -218,7 +220,7 @@ public:
         // blob pointer is allready point to next row
         if (m_hd)
         {
-            while (row - m_hd->curRow)
+            while (row - m_invalidRows - m_hd->curRow)
             {
                 for (int j = 0; j < m_hd->fieldCount; ++j)
                     m_hd->nextField = (blobField*)m_hd->nextField->next();
@@ -400,14 +402,16 @@ public:
 
         if ((m_len == 0) && m_filter->isSeeksMode() && fieldCount)
         {
-
+            ++m_invalidRows;
             m_seekMultiStat = STATUS_NOT_FOUND_TI;
+            m_tb->fields().setInvalidMemblock(0);
             memset(m_tmpPtr, 0, td->recordlen());
             return m_tmpPtr;
         }
         else
         {
             m_seekMultiStat = 0;
+            m_tb->fields().setInvalidMemblock(-1);
             if (m_filter->fieldSelected())
             {
                 int selNullbytes = m_filter->selectedNullbytes();
@@ -930,7 +934,7 @@ void table::btrvSeekMulti()
     int rowOffset = 0;
     for (int i = 0; i < (int)seeks.size(); ++i)
     {
-
+        memset(m_impl->keybuf, 0, MAX_KEYLEN);
         seeks[i].writeBuffer((uchar_td*)m_impl->keybuf, true, transactd);
         if (hasManyJoin)
         {
@@ -1083,6 +1087,7 @@ void table::find(eFindType type)
     {
         type = m_impl->filterPtr->direction();
         op =(type == findForword) ? TD_KEY_NEXT_MULTI : TD_KEY_PREV_MULTI;
+        m_impl->filterPtr->resetReaded();
         m_stat = 0;
     }
     else if (m_impl->filterPtr->isSeeksMode())
@@ -1294,6 +1299,7 @@ void table::setFilter(const _TCHAR* str, ushort_td RejectCount,
 void table::clearBuffer(eNullReset resetType)
 {
     m_impl->rc->reset();
+    m_impl->fields.setInvalidMemblock(-1);
     m_pdata = m_impl->dataBak;
     tabledef* td = (*m_tableDef);
     if (td->isMysqlNullMode() && td->defaultImage)
@@ -1406,12 +1412,19 @@ bool table::onUpdateCheck(eUpdateType type)
         {
             if (isUseTransactd() == false)
             {
+                __int64 v = updateConflictCheck() ? getUpdateStampValue() : 0;
                 // backup update data
                 smartUpdate();
                 seek();
                 m_impl->smartUpDateFlag = false;
                 if (m_stat)
                     return false;
+                
+                if (v && v != getUpdateStampValue())
+                {
+                    m_stat = STATUS_CHANGE_CONFLICT;
+                    return false;
+                }
                 memcpy(m_pdata, m_impl->smartUpDate, m_datalen);
             }
         }
@@ -1452,6 +1465,27 @@ bool table::onDeleteCheck(bool inkey)
     return true;
 }
 
+bool table::getUpdateStampEnable() const 
+{
+    return (tableDef()->m_utimeFieldNum != 0xffff);
+}
+
+__int64 table::getUpdateStampValue() const
+{
+    const tabledef* td = tableDef();
+    if (td->m_utimeFieldNum != 0xffff)
+    {
+        void* p = fieldPtr(td->m_utimeFieldNum);
+        __int64 v = 0;
+        memcpy(&v, p, td->fieldDefs[td->m_utimeFieldNum].len);
+        return v;
+    }else
+        m_stat = STATUS_INVARID_FIELD_IDX;
+        /*else if(isUseTransactd() == false)
+        return getRecordHash();*/
+    return 0;
+}
+
 ushort_td table::doCommitBulkInsert(bool autoCommit)
 {
     ushort_td ret = nstable::doCommitBulkInsert(autoCommit);
@@ -1519,7 +1553,7 @@ void table::doInit(tabledef** Def, short fnum, bool /*regularDir*/, bool mysqlnu
     tabledef* td = *m_tableDef; 
 
     incTabledefRefCount(td, mysqlnull);
-    m_fddefs->addAllFileds(td);
+    m_fddefs->addAllFields(td);
     m_fddefs->cv()->setCodePage(mysql::codePage(td->charsetIndex));
     ushort_td len = td->recordlen();
     if (len == 0)
@@ -2028,7 +2062,7 @@ bool table::checkIndex(short index) const
     return true;
 }
 
-unsigned int table::getRecordHash()
+unsigned int table::getRecordHash() const
 {
     return hash((const char*)fieldPtr(0), datalen());
 }
@@ -2079,12 +2113,13 @@ bool table::setSeekValueField(int row)
     // Check uniqe key
     if (kd->segments[0].flags.bit0)
         return false;
-
+    
     const uchar_td* ptr = (const uchar_td*)keyValues[row].data;
     const uchar_td* data;
     ushort_td dataSize;
     if (ptr)
     {
+        fields().setInvalidMemblock(-1);
         for (int j = 0; j < kd->segmentCount; ++j)
         {
             short filedNum = kd->segments[j].fieldNum;
@@ -2100,6 +2135,7 @@ bool table::setSeekValueField(int row)
             else
                 setFV(filedNum, _T(""));
         }
+        fields().setInvalidMemblock(0);
     }
     else
         return false;
@@ -2110,17 +2146,24 @@ void table::keyValueDescription(_TCHAR* buf, int bufsize)
 {
 
     std::_tstring s;
-    if (stat() == STATUS_NOT_FOUND_TI)
+    short st = stat() ;
+    if (st == STATUS_NOT_FOUND_TI || st == 0)
     {
-
+        bool invalid = fields().isInvalidRecord();
+        fields().setInvalidMemblock(-1);
         for (int i = 0; i < tableDef()->keyDefs[(int)keyNum()].segmentCount; i++)
         {
             short fnum = tableDef()->keyDefs[(int)keyNum()].segments[i].fieldNum;
             s += std::_tstring(tableDef()->fieldDefs[fnum].name()) + _T(" = ") +
                  getFVstr(fnum) + _T("\n");
         }
+        if (invalid)
+        {
+            fields().setInvalidMemblock(0);
+            st = STATUS_NOT_FOUND_TI;
+        }
     }
-    else if (stat() == STATUS_DUPPLICATE_KEYVALUE)
+    else if (st == STATUS_DUPPLICATE_KEYVALUE)
     {
         _TCHAR tmp[50];
         for (int j = 0; j < tableDef()->keyCount; j++)
@@ -2137,7 +2180,7 @@ void table::keyValueDescription(_TCHAR* buf, int bufsize)
     }
 
     _stprintf_s(buf, bufsize, _T("table:%s\nstat:%d\n%s"),
-                tableDef()->tableName(), stat(), s.c_str());
+                tableDef()->tableName(), st, s.c_str());
 }
 
 short table::getCurProcFieldCount() const
@@ -2154,6 +2197,13 @@ short table::getCurProcFieldIndex(short index) const
     return m_impl->filterPtr->selectFieldIndexes()[index];
 }
 
+void table::setAlias(const _TCHAR* orign, const _TCHAR* alias)
+{
+    short index = fieldNumByName(orign);
+    if (index != -1)
+        const_cast<fielddefs*>(fields().fieldDefs())->addAliasName(index, alias);
+}
+
 //-------------------------------------------------------------------
 //      class queryBase
 //-------------------------------------------------------------------

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

@@ -128,6 +128,8 @@ class DLLLIB table : public nstable
     void* doDdba(uint_td size);
     bool isReadContinue(ushort_td& op);
     void incTabledefRefCount(tabledef* td, bool mysqlMullmode);
+    __int64 getUpdateStampValue() const;// orverride
+    bool getUpdateStampEnable() const;// orverride
 
 protected:
     explicit table(nsdatabase* pbe); // Inheritance is impossible
@@ -199,7 +201,7 @@ public:
     void moveBookmarks(unsigned int index);
     bookmark_td bookmarks(unsigned int index) const;
     void clearBuffer(eNullReset resetType = defaultNull);
-    unsigned int getRecordHash();
+    unsigned int getRecordHash() const;
     void smartUpdate();
 
     void setMra(multiRecordAlocator* p);
@@ -328,6 +330,7 @@ public:
     void setOnRecordCount(const recordCountFn v);
     recordCountFn onRecordCount() const;
     client::fields& fields();
+    void setAlias(const _TCHAR* orign, const _TCHAR* alias);
 };
 
 #define KEYVALUE_PTR 0

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

@@ -81,10 +81,27 @@ public:
                          ,const _TCHAR* userName=NULL, const _TCHAR* passwd=NULL)
         : m_type(TYPE_SCHEMA_BDF), m_mode(TD_OPEN_READONLY)
     {
+        if (!protocol || !hostOrIp || !dbname) return;
+
         _TCHAR dbf[MAX_PATH]={0x00};
+        const _TCHAR* ext = _T(".bdf");
+        if (protocol[0] == 'b')
+        { // btrv include file extension
+            if (_tcscmp(schemaTable, _T("file")) == 0 ||
+                        _tcscmp(schemaTable, _T("FILE")) == 0)
+            {
+                ext = _T(".ddf");
+                m_type = TYPE_SCHEMA_DDF;
+            }
+            if (_tcsstr(schemaTable, _T(".ddf")) || _tcsstr(schemaTable, _T(".DDF")))
+            {
+                m_type = TYPE_SCHEMA_DDF;
+                ext = _T("");
+            }
+        }
         if (schemaTable && schemaTable[0])
         {
-            const _TCHAR* ext = _T(".bdf");
+
             if (_tcscmp(schemaTable, TRANSACTD_SCHEMANAME)==0)
                 ext = _T("");
             _stprintf_s(dbf, MAX_PATH, _T("dbfile=%s%s"), schemaTable, ext);   

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

@@ -733,6 +733,7 @@ public:
 
 #endif
 
+    /* one-to-one relation only */
     template <class Container>
     void readEach(Container& mdls, queryBase& q, bool sorted = false,
                   bzs::rtl::exception * e = NULL)
@@ -781,7 +782,8 @@ public:
                  (m_map.compKeyValue(mdlb, mdl, m_tb->keyNum()) == true)))
             {
                 m_tb->findNext();
-                if (m_tb->stat() != 0)
+                if ((m_tb->stat() != STATUS_SUCCESS) &&
+                    (m_tb->stat() != STATUS_NOT_FOUND_TI))
                 {
                     _TCHAR buf[8192];
                     m_tb->keyValueDescription(buf, 8192);
@@ -799,6 +801,7 @@ public:
         }
     }
 
+    /* one-to-one relation only */
     template <class BaseContainer, class T2>
     void readEach(BaseContainer& mdls, T* (T2::*func)() const, queryBase& q)
     {
@@ -808,6 +811,7 @@ public:
         readEach(*refList, q, true, NULL);
     }
 
+    /* one-to-one relation only */
     template <class BaseContainer, class T2>
     void readEach(BaseContainer& mdls, T* (T2::*func)() const, queryBase& q,
                   bzs::rtl::exception& e)
@@ -818,7 +822,7 @@ public:
         readEach(*refList, q, true, &e);
     }
 
-    /* No use field select */
+    /* No use field select. one-to-one relation only */
     template <class Container>
     void readEach(Container& mdls, bool sorted = false,
                   bzs::rtl::exception * e = NULL)
@@ -838,7 +842,8 @@ public:
             {
                 m_map.setKeyValues(mdl, fds, m_tb->keyNum());
                 readIndex(m_tb, eSeekEqual);
-                if (m_tb->stat() != 0)
+                if ((m_tb->stat() != STATUS_SUCCESS) &&
+                    (m_tb->stat() != STATUS_NOT_FOUND_TI))
                 {
                     _TCHAR buf[8192];
                     m_tb->keyValueDescription(buf, 8192);
@@ -856,7 +861,7 @@ public:
         }
     }
 
-    /* No use field select */
+    /* No use field select. one-to-one relation only */
     template <class BaseContainer, class T2>
     void readEach(BaseContainer& mdls, T* (T2::*func)() const)
     {
@@ -866,6 +871,7 @@ public:
         readEach(*refList, true, NULL);
     }
 
+    /* one-to-one relation only */
     template <class BaseContainer, class T2>
     void readEach(BaseContainer& mdls, T* (T2::*func)() const,
                   bzs::rtl::exception& e)

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

@@ -927,8 +927,8 @@ inline judgeFunc getJudgeFunc(eCompType log)
     case eLess: 
         return isMatch3;
     case eNotEq: 
-        return isMatch4;
     case eNotBitAnd:
+        return isMatch4;
     case eGreaterEq:
         return isMatch5;
     case eLessEq: 

data/source/bzs/db/protocol/tdap/mysql/characterset.h

@@ -30,6 +30,7 @@
 #define CHARSET_USC2 23
 #define CHARSET_UTF8B4 30
 #define CHARSET_UTF16LE 33
+#define CHARSET_BIN   37
 #define CHARSET_CP932 38
 #define CHARSET_EUCJ 40
 

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

@@ -43,7 +43,7 @@ namespace tdap
 namespace mysql
 {
 
-schemaBuilder::schemaBuilder(void): m_stat(0)
+schemaBuilder::schemaBuilder(unsigned char binFdCharset): m_stat(0), m_binFdCharset(binFdCharset)
 {
 }
 
@@ -175,7 +175,7 @@ tabledef* schemaBuilder::getTabledef(engine::mysql::table* src, int id,
     td.keyCount = (uchar_td)src->keys();
     td.charsetIndex = charsetIndex(src->charset().csname);
     td.primaryKeyNum =
-        (src->primarykeyNum() < td.keyCount) ? kc.clientKeynum(src->primarykeyNum()) : -1;
+        (src->primarykeyNum() < td.keyCount) ? kc.keyNumByMakeOrder(src->primarykeyNum()) : -1;
 #ifdef USE_BTRV_VARIABLE_LEN
     td.flags.bit0 = (src->recordFormatType() & RF_FIXED_PLUS_VALIABLE_LEN);
     if (src->recordFormatType() & RF_FIXED_PLUS_VALIABLE_LEN)
@@ -232,6 +232,9 @@ tabledef* schemaBuilder::getTabledef(engine::mysql::table* src, int id,
             fd.setPadCharSettings(false, true);
             if (f->has_charset())
                 fd.setCharsetIndex(charsetIndex(f->charset()->csname));
+            else if (fd.type == ft_string || fd.type == ft_lstring
+                || fd.type == ft_myvarbinary || fd.type == ft_myblob)
+                fd.setCharsetIndex(m_binFdCharset);
 
             if ((fd.type == ft_mydatetime || fd.type == ft_mytimestamp) && (f->val_real() == 0))
             {// No constant value
@@ -342,7 +345,7 @@ short schemaBuilder::insertMetaRecord(table* mtb, table* src, int id, bool nouse
     
     tabledef* td = getTabledef(src, id, nouseNullkey, rec.get(), 65000);
     mtb->clearBuffer();
-    mtb->setRecordFromPacked(rec.get(), td->varSize + 4, NULL);
+    mtb->setRecordFromPacked(rec.get(), td->varSize + 4, NULL, NULL);
     mtb->insert(true);
     return mtb->stat();
 }
@@ -393,12 +396,15 @@ table* getTable(database* db, const char *name)
 void schemaBuilder::listTable(database* db, std::vector<std::string>& tables, int type)
 {
     char path[FN_REFLEN + 1];
+    tables.clear();
     build_table_filename(path, sizeof(path) - 1, db->name().c_str(), "", "", 0);
     std::string s = path;
     fs::path p = s;
+    if (exists(p) == false) return;
+
     fs::directory_iterator it(p);
     fs::directory_iterator end;
-    tables.clear();
+    
 
     for (fs::directory_iterator it(p); it != end; ++it)
     {
@@ -456,6 +462,7 @@ short schemaBuilder::execute(database* db, table* mtb, bool nouseNullkey)
 
     std::string s = path;
     fs::path p = s;
+    if (exists(p) == false) return STATUS_TABLE_NOTOPEN;
     fs::directory_iterator it(p);
     fs::directory_iterator end;
     int id = 0;

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

@@ -49,8 +49,9 @@ class schemaBuilder
     short insertMetaRecord(engine::mysql::table* mtb, engine::mysql::table* src,
                            int id, bool nouseNullkey);
     short m_stat;
+    unsigned char m_binFdCharset;
 public:
-    schemaBuilder();
+    schemaBuilder(unsigned char binFdCharset);
     ~schemaBuilder();
     short stat() const { return m_stat;}
     tabledef* getTabledef(engine::mysql::table* src, int id, bool nouseNullkey, uchar* rec, size_t size);