transactd 3.5.0 → 3.6.0

data/source/bzs/test/trdclengn/testField.h

@@ -21,6 +21,7 @@
 #include "testbase.h"
 #include <bzs/db/protocol/tdap/btrDate.h>
 #include <bzs/db/protocol/tdap/client/connMgr.h>
+#include <bzs/db/protocol/tdap/client/stringConverter.h>
 #include <limits.h>
 #include <stdlib.h>
 
@@ -494,6 +495,13 @@ short createTestUsers(database* db)
         fd->setNullable(true);
         fd = insertField(def, tableid, ++fieldnum, _T("name"), ft_myvarchar, 151);
         fd->setLenByCharnum(50);
+        fd = insertField(def, tableid, ++fieldnum, _T("blob"), ft_myblob, 9);
+        fd->setCharsetIndex(CHARSET_BIN);
+        fd->setNullable(true);
+
+        fd = insertField(def, tableid, ++fieldnum, _T("utime"), ft_mytimestamp, 7);
+        fd->setDefaultValue(DFV_TIMESTAMP_DEFAULT);
+        fd->setTimeStampOnUpdate(true);
 
         keydef* kd = insertKey(def, tableid, 0);
         kd->segments[0].fieldNum = 0;
@@ -3384,7 +3392,7 @@ void testConnMgr()
     {
         const connMgr::records& recs = mgr->slaveHosts();
         BOOST_CHECK(mgr->stat() == 0);
-        for (int i=0;i<recs.size();++i)
+        for (int i=0;i<(int)recs.size();++i)
         {
             _TCHAR tmp[1024];
             recs[i].value(tmp, 1024);
@@ -3419,6 +3427,519 @@ void testCreateInfo()
     BOOST_CHECK(db->stat() == 0);
 }
 
+void testAlias()
+{
+    try
+    {
+        database_ptr db = createDatabaseObject();
+        openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+        table_ptr tb = openTable(db, _T("users"));
+        tb->setAlias(_T("name"), _T("name_alias"));
+        tb->setAlias(_T("name"), _T("name_alias2"));
+        tb->setKeyNum(0);
+        tb->seekFirst();
+        BOOST_CHECK(tb->stat() == 0);
+        // access original 
+        BOOST_CHECK(_tstring(tb->getFVstr(_T("name"))) == _tstring(_T("John")));
+        // access alias 
+        BOOST_CHECK(_tstring(tb->getFVstr(_T("name_alias"))) == _tstring(_T("John")));
+        BOOST_CHECK(_tstring(tb->getFVstr(_T("name_alias2"))) == _tstring(_T("John")));
+        //query
+        query q;
+        q.select(_T("name_alias2_"));
+        tb->setQuery(&q);
+        BOOST_CHECK(tb->stat() != 0);
+
+        q.reset().select(_T("name_alias2"));
+        tb->setQuery(&q);
+        BOOST_CHECK(tb->stat() == 0);
+        tb->clearBuffer();
+        tb->find();
+        if (tb->stat() == 0)
+            BOOST_CHECK(_tstring(tb->getFVstr(_T("name_alias2"))) == _tstring(_T("John")));
+        while (tb->stat() == 0)
+        {
+            BOOST_CHECK(_tstring(tb->getFVstr(_T("name"))) != _tstring(_T("")));
+            tb->findNext();
+        }
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("Error! %s\n"), (*getMsg(e)).c_str());
+    }
+}
+
+void testAutoincWithBlob()
+{
+    try
+    {
+        database_ptr db = createDatabaseObject();
+        openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+        table_ptr tb = openTable(db, _T("users"));
+        
+        tb->setKeyNum(0);
+        tb->clearBuffer();
+        tb->setFV(_T("blob"), "abc");
+        tb->insert();
+        BOOST_CHECK(tb->stat() == 0);
+        BOOST_CHECK(tb->getFVint(_T("id")) > 0);
+        BOOST_CHECK(strcmp(tb->getFVAstr(_T("blob")), "abc") == 0);
+
+        tb->clearBuffer();
+        tb->setFVNull(_T("blob"), true);
+        tb->insert();
+        BOOST_CHECK(tb->stat() == 0);
+        BOOST_CHECK(tb->getFVint(_T("id")) > 0);
+        BOOST_CHECK(tb->getFVNull(_T("blob")) == true);
+
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(false);
+        _tprintf(_T("Error! %s\n"), (*getMsg(e)).c_str());
+    }
+}
+
+void testBinaryFieldConvert()
+{
+// Ansi
+    stringConverter cv(CP_UTF8, CP_UTF8);
+    //Unicode --> utf8
+    bool ret = cv.isNeedConvert<WCHAR, char>() == true;
+    BOOST_CHECK(ret);
+
+    //utf8 --> utf8
+    ret = cv.isNeedConvert<char, char>() == false;
+    BOOST_CHECK(ret);
+    
+    //cp932 --> utf8
+    cv.setCodePage(932);
+    ret = cv.isNeedConvert<char, char>() == true;
+    BOOST_CHECK(ret);
+
+    //binnary --> utf8
+    cv.setCodePage(0);
+    ret = cv.isNeedConvert<char, char>() == false;
+    BOOST_CHECK(ret);
+
+    //binnary ? Unicode --> utf8,  Unicode fields are force convert
+    ret = cv.isNeedConvert<WCHAR, char>() == true;
+    BOOST_CHECK(ret);
+
+// Unicode
+    // Unicode --> Unicode
+    cv.setCodePage(CP_UTF8);
+    ret = cv.isNeedConvert<WCHAR, WCHAR>() == false;
+    BOOST_CHECK(ret);
+
+    //utf8 --> Unicode
+    ret = cv.isNeedConvert<char, WCHAR>() == true;
+    BOOST_CHECK(ret);
+    
+    //cp932 --> Unicode
+    cv.setCodePage(932);
+    ret = cv.isNeedConvert<char, WCHAR>() == true;
+    BOOST_CHECK(ret);
+
+    //binnary --> Unicode
+    cv.setCodePage(0);
+    ret = cv.isNeedConvert<char, WCHAR>() == false;
+    BOOST_CHECK(ret);
+
+    //binnary ? Unicode --> Unicode,  
+    ret = cv.isNeedConvert<WCHAR, WCHAR>() == false;
+    BOOST_CHECK(ret);
+
+}
+
+void testTableInvalidRecord()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    table_ptr tb = openTable(db, _T("users"));
+    query q;
+    q.in(1,2,-1,3,4,50000);
+    tb->clearBuffer();
+    tb->setKeyNum(0);
+    tb->setQuery(&q);
+    tb->find();
+    int i = 0;
+    int fdi = 0;
+    while (tb->stat()==0 || tb->stat() == STATUS_NOT_FOUND_TI)
+    {
+        if (i == 2 || i == 5)
+        {
+            BOOST_CHECK(tb->fields().isInvalidRecord() == true);
+            BOOST_CHECK(tb->fields()[fdi].isNull() == true);
+        }
+        else
+        {
+            BOOST_CHECK(tb->fields().isInvalidRecord() == false);
+            BOOST_CHECK(tb->fields()[fdi].isNull() == false);
+        }
+        //printf("index %d = %s\n", i, tb->fields()[fdi].isNull() ? "NULL" : "NOT NULL");
+        tb->findNext();
+        ++i;
+    }
+    BOOST_CHECK(tb->fields().isInvalidRecord() == true);
+    tb->clearBuffer();
+    BOOST_CHECK(tb->fields().isInvalidRecord() == false);
+
+    activeTable at(db, _T("users"));
+    recordset rs;
+    at.index(0).read(rs, q);
+    BOOST_CHECK(rs.size() == 6);
+
+    for  (int i = 0; i < (int)rs.size(); ++i)
+    {
+        if (i == 2 || i == 5)
+        {
+            BOOST_CHECK(rs[i].isInvalidRecord() == true);
+            BOOST_CHECK(rs[i][fdi].isNull() == true);
+        }
+        else
+        {
+            BOOST_CHECK(rs[i].isInvalidRecord() == false);
+            BOOST_CHECK(rs[i][fdi].isNull() == false);
+        }
+    }
+
+}
+
+bool checkTimeStampFormat(database_ptr db, const char* funcName)
+{
+    btrVersions versions;
+    db->getBtrVersion(&versions);
+    if(versions.versions[VER_IDX_DB_SERVER].isFullLegacyTimeFormat())
+    {
+        printf("[Warning] Server not support timstamp with microseconds.(%s is passed)\n", funcName);
+        return false;
+    }
+    return true;
+}
+
+void test_UTCC()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    if (checkTimeStampFormat(db, "test_UTCC") == false)
+        return;
+    table_ptr tb = openTable(db, _T("users"));
+    table_ptr tb2 = openTable(db, _T("users"));
+    // test in changeCurrentCc or changeCurrentNcc
+		
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    //Sleep(1000);
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->setFV(_T("name"), _T("mike"));
+    tb2->setUpdateConflictCheck(true);
+    tb2->update(nstable::changeCurrentCc);
+    BOOST_CHECK(tb2->stat() == STATUS_CHANGE_CONFLICT);
+    db->abortTrn();
+
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->setFV(_T("name"), _T("mike"));
+	tb2->setUpdateConflictCheck(false);	
+    tb2->update(nstable::changeCurrentCc);
+    BOOST_CHECK(tb2->stat() == 0);
+    db->abortTrn();
+		
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    //Sleep(1000);
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->setFV(_T("name"), _T("mike"));
+    // test in changeInKey
+    tb2->setUpdateConflictCheck(true);
+    tb2->update(nstable::changeInKey);
+    BOOST_CHECK(tb2->stat() == STATUS_CHANGE_CONFLICT);
+    db->abortTrn();
+
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->setFV(_T("name"), _T("mike"));
+	tb2->setUpdateConflictCheck(false);	
+    tb2->update(nstable::changeInKey);
+    BOOST_CHECK(tb2->stat() == 0);
+    db->abortTrn();
+}
+
+void test_UTCC_delete()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    if (checkTimeStampFormat(db, "test_UTCC_delete") == false)
+        return;
+    table_ptr tb = openTable(db, _T("users"));
+    table_ptr tb2 = openTable(db, _T("users"));
+    // test in changeCurrentCc or changeCurrentNcc
+		
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    //Sleep(1000);
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->setUpdateConflictCheck(true);
+    tb2->del(false);
+    BOOST_CHECK(tb2->stat() == STATUS_CHANGE_CONFLICT);
+    db->abortTrn();
+
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+	tb2->setUpdateConflictCheck(false);	
+    tb2->del(false);
+    BOOST_CHECK(tb2->stat() == 0);
+    db->abortTrn();
+		
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    //Sleep(1000);
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+    // test in changeInKey
+    tb2->setUpdateConflictCheck(true);	
+    tb2->del(true);
+    BOOST_CHECK(tb2->stat() == STATUS_CHANGE_CONFLICT);
+    db->abortTrn();
+
+    db->beginTrn();
+    tb->seekFirst();
+    BOOST_CHECK(tb->stat() == 0);
+    tb2->seekFirst();
+    BOOST_CHECK(tb2->stat() == 0);
+    tb->setFV(_T("name"), _T("John"));
+    tb->update();
+    BOOST_CHECK(tb->stat() == 0);
+	tb2->setUpdateConflictCheck(false);		
+    tb2->del(true);
+    BOOST_CHECK(tb2->stat() == 0);
+    db->abortTrn();
+}
+
+
+void test_UTCC_wt()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    if (checkTimeStampFormat(db, "test_UTCC_wt") == false)
+        return;
+    activeTable at(db, _T("users"));
+    activeTable at2(db, _T("users"));
+    writableRecord& wr = at.getWritableRecord();
+    writableRecord& wr2 = at2.getWritableRecord();
+		
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    bool ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    bool ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.update();
+
+    wr2[_T("name")] = _T("mike");
+    at2.table()->setUpdateConflictCheck(true);
+    try
+    {
+        wr2.update(true, true);
+        BOOST_CHECK(false);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    try
+    {
+        wr2.update();
+        BOOST_CHECK(false);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    db->abortTrn();
+
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.update();
+
+    wr2[_T("name")] = _T("mike");
+    at2.table()->setUpdateConflictCheck(false);
+    try
+    {
+        wr2.update();
+        BOOST_CHECK(true);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    db->abortTrn();
+		
+    
+}
+
+void test_UTCC_wt_save()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    if (checkTimeStampFormat(db, "test_UTCC_wt_save") == false)
+        return;
+    activeTable at(db, _T("users"));
+    activeTable at2(db, _T("users"));
+    writableRecord& wr = at.getWritableRecord();
+    writableRecord& wr2 = at2.getWritableRecord();
+		
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    bool ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    bool ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.save();
+
+    wr2[_T("name")] = _T("mike");
+    at2.table()->setUpdateConflictCheck(true);
+    try
+    {
+        wr2.save();
+        BOOST_CHECK(false);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    
+    db->abortTrn();
+
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.save();
+
+    wr2[_T("name")] = _T("mike");
+    at2.table()->setUpdateConflictCheck(false);
+    try
+    {
+        wr2.save();
+        BOOST_CHECK(true);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    db->abortTrn();
+		
+    
+}
+
+void test_UTCC_wt_delete()
+{
+    database_ptr db = createDatabaseObject();
+    openDatabase(db, makeUri(PROTOCOL, HOSTNAME, DBNAMEV3, BDFNAME), TYPE_SCHEMA_BDF);
+    if (checkTimeStampFormat(db, "test_UTCC_wt_delete") == false)
+        return;
+    activeTable at(db, _T("users"));
+    activeTable at2(db, _T("users"));
+    writableRecord& wr = at.getWritableRecord();
+    writableRecord& wr2 = at2.getWritableRecord();
+ 		
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    bool ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    bool ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.update();
+    at2.table()->setUpdateConflictCheck(true);
+    try
+    {
+        wr2.del();
+        BOOST_CHECK(false);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    db->abortTrn();
+
+    db->beginTrn();
+    wr[_T("id")] = 1;
+    ret = wr.read();
+    BOOST_CHECK(ret);
+    wr2[_T("id")] = 1;
+    ret2 = wr2.read();
+    BOOST_CHECK(ret2);
+    wr[_T("name")] = _T("John");
+    wr.update();
+    at2.table()->setUpdateConflictCheck(false);
+    try
+    {
+        wr2.del();
+        BOOST_CHECK(true);
+    }
+    catch(bzs::rtl::exception& e)
+    {
+        BOOST_CHECK(*bzs::rtl::getCode(e) == STATUS_CHANGE_CONFLICT);
+    }
+    db->abortTrn();
+}
+
 #pragma warning(default : 4996) 
 
 #endif // BZS_TEST_TRDCLENGN_TESTFIELD_H

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

@@ -218,7 +218,7 @@ void testFielddefs(database* db)
         BOOST_CHECK_MESSAGE(fd->nullbytes() == 2, "Invalid nullbytes = " << (int)fd->nullbytes());
         //fielddefs copy test
         fielddefs& fds = *fielddefs::create();
-        fds.addAllFileds(tb->tableDef());
+        fds.addAllFields(tb->tableDef());
         fd = &fds[1];
         BOOST_CHECK_MESSAGE(fd->nullbit() == 0, "Invalid nullbit = " << (int)fd->nullbit());
         BOOST_CHECK_MESSAGE(fd->nullbytes() == 2, "Invalid nullbytes = " << (int)fd->nullbytes());
@@ -1066,6 +1066,42 @@ BOOST_AUTO_TEST_CASE(createInfo)
 }
 BOOST_AUTO_TEST_SUITE_END()
 
+BOOST_AUTO_TEST_SUITE(tableAlias)
+BOOST_AUTO_TEST_CASE(tableAlias)
+{
+    testAlias();
+    testAutoincWithBlob();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(binaryFieldConvert)
+BOOST_AUTO_TEST_CASE(binaryFieldConvert)
+{
+    testBinaryFieldConvert();
+}
 
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(table_in)
+BOOST_AUTO_TEST_CASE(table_in_invalid)
+{
+    testTableInvalidRecord();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE(table_utcc)
+BOOST_AUTO_TEST_CASE(table_utcc1)
+{
+    test_UTCC();
+    test_UTCC_delete();
+    test_UTCC_wt();
+    test_UTCC_wt_save();
+    test_UTCC_wt_delete();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+    
     
 // ------------------------------------------------------------------------

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

@@ -139,11 +139,12 @@ void testClone(database* db)
     db->close();
     BOOST_CHECK_MESSAGE(db->stat() == 0, "db close stat = " << db->stat());
     table* tb = db2->openTable(_T("user"), TD_OPEN_NORMAL);
-    BOOST_CHECK_MESSAGE(0 == db2->stat(), "openTable" << db2->stat());
+    BOOST_CHECK_MESSAGE(0 == db2->stat(), "openTable " << db2->stat());
     if (db2)
         db2->release();
     bool ret = nsdatabase::testTablePtr(tb);
     BOOST_CHECK_MESSAGE(ret == true, "testTablePtr");
+    
     tb->release();
 
     ret = nsdatabase::testTablePtr(tb);
@@ -490,20 +491,24 @@ void testFindIn(database* db)
     BOOST_CHECK_MESSAGE(tb->getFVint(fdi_id) == 10, "find in 10");
     tb->findNext();
     BOOST_CHECK_MESSAGE(tb->stat() == 4, "find in 300000 stat =" << tb->stat());
+    BOOST_CHECK(tb->fields().isInvalidRecord() == true);
+
 
     _TCHAR msg[1024];
     tb->keyValueDescription(msg, 1024);
     int comp = _tcscmp(_T("table:user\nstat:4\nid = 300000\n"), msg);
-    BOOST_CHECK_MESSAGE(comp == 0, "find in keyValueDescription");
+    BOOST_CHECK_MESSAGE(comp == 0, "find in keyValueDescription" );
+
 
     tb->findNext();
     BOOST_CHECK_MESSAGE(tb->getFVint(fdi_id) == 50, "find in 50");
     tb->findNext();
     BOOST_CHECK_MESSAGE(tb->stat() == 4, "find in -1");
+    BOOST_CHECK(tb->fields().isInvalidRecord() == true);
 
     tb->keyValueDescription(msg, 1024);
     comp = _tcscmp(_T("table:user\nstat:4\nid = -1\n"), msg);
-    BOOST_CHECK_MESSAGE(comp == 0, "find in keyValueDescription");
+    BOOST_CHECK_MESSAGE(comp == 0, "find in keyValueDescription" );
 
     tb->findNext();
     BOOST_CHECK_MESSAGE(tb->getFVint(fdi_id) == 80, "find in 80");
@@ -5226,6 +5231,56 @@ void testBinaryField()
     }
 }
 
+void testBinaryFieldSchame()
+{
+    database_ptr db = createDatabaseObject();
+    connectParams param(PROTOCOL, HOSTNAME, _T("querytest"),
+                            TRANSACTD_SCHEMANAME, g_userName, g_password);
+    param.setMode(TD_OPEN_NORMAL);
+    //prebuiltData(db.get(), param);
+    database::setCompatibleMode(database::CMP_MODE_OLD_ALL);
+    openDatabase(db, param);
+    short tbid = db->dbDef()->tableNumByName(_T("groups"));
+    BOOST_CHECK(tbid > 0);
+    const fielddef* fd =  &db->dbDef()->tableDefs(tbid)->fieldDefs[1];
+    BOOST_CHECK(fd->charsetIndex() == mysql::charsetIndex(GetACP()));
+    db->close(true /* withDropDefaultSchema */);
+
+    database::setCompatibleMode(database::CMP_MODE_MYSQL_NULL);
+    openDatabase(db, param);
+    tbid = db->dbDef()->tableNumByName(_T("groups"));
+    BOOST_CHECK(tbid > 0);
+    fd =  &db->dbDef()->tableDefs(tbid)->fieldDefs[1];
+    BOOST_CHECK(fd->charsetIndex() == CHARSET_BIN);
+    db->close(true /* withDropDefaultSchema */);
+
+
+    connectParams param2(PROTOCOL, HOSTNAME, _T("querytest"),
+                            NULL, g_userName, g_password);
+    database::setCompatibleMode(database::CMP_MODE_OLD_BIN);
+    openDatabase(db, param2);
+    table* tb = db->openTable(_T("groups"));
+    BOOST_CHECK(db->stat() == 0);
+    tbid = db->dbDef()->tableNumByName(_T("groups"));
+    BOOST_CHECK(tbid > 0);
+    fd =  &db->dbDef()->tableDefs(tbid)->fieldDefs[1];
+    BOOST_CHECK(fd->charsetIndex() == mysql::charsetIndex(GetACP()));
+    tb->release();
+    db->close(true /* withDropDefaultSchema */);
+
+    database::setCompatibleMode(database::CMP_MODE_MYSQL_NULL);
+    openDatabase(db, param2);
+    tb = db->openTable(_T("groups"));
+    BOOST_CHECK(db->stat() == 0);
+    tbid = db->dbDef()->tableNumByName(_T("groups"));
+    BOOST_CHECK(tbid > 0);
+    fd =  &db->dbDef()->tableDefs(tbid)->fieldDefs[1];
+    BOOST_CHECK(fd->charsetIndex() == CHARSET_BIN);
+    tb->release();
+    db->close(true /* withDropDefaultSchema */);
+
+}
+
 void testGetDirUri()
 {
     _TCHAR retbuf[MAX_PATH];
@@ -5651,8 +5706,11 @@ BOOST_AUTO_TEST_SUITE(field)
 
 BOOST_AUTO_TEST_CASE(binary)
 {
-    testBinaryField();    
+    testBinaryField();
+    testBinaryFieldSchame();    
 }
+
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE(static_function)