From d9bcaa19a49c6a3be2507166cc8195ad39005af0 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 22 Sep 2012 03:48:07 +0000 Subject: [PATCH] MySQL Windows Unicode driver test --- Data/ODBC/testsuite/src/ODBCMySQLTest.cpp | 6 +++--- Data/include/Poco/Data/StatementImpl.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index e5fcfa479..056f31577 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -60,7 +60,7 @@ using Poco::Tuple; using Poco::NotFoundException; -#define MYSQL_ODBC_DRIVER "MySQL ODBC 5.2 Driver" +#define MYSQL_ODBC_DRIVER "MySQL ODBC 5.2w Driver" #define MYSQL_DSN "PocoDataMySQLTest" #define MYSQL_SERVER POCO_ODBC_TEST_DATABASE_SERVER #define MYSQL_DB "test" @@ -465,8 +465,8 @@ CppUnit::Test* ODBCMySQLTest::suite() CppUnit_addTest(pSuite, ODBCMySQLTest, testLimitPrepare); CppUnit_addTest(pSuite, ODBCMySQLTest, testLimitZero); CppUnit_addTest(pSuite, ODBCMySQLTest, testPrepare); - //CppUnit_addTest(pSuite, ODBCMySQLTest, testBulk); - //CppUnit_addTest(pSuite, ODBCMySQLTest, testBulkPerformance); + CppUnit_addTest(pSuite, ODBCMySQLTest, testBulk); + CppUnit_addTest(pSuite, ODBCMySQLTest, testBulkPerformance); CppUnit_addTest(pSuite, ODBCMySQLTest, testSetSimple); CppUnit_addTest(pSuite, ODBCMySQLTest, testSetComplex); CppUnit_addTest(pSuite, ODBCMySQLTest, testSetComplexUnique); diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h index e2f0a8a86..f3d57f9e0 100644 --- a/Data/include/Poco/Data/StatementImpl.h +++ b/Data/include/Poco/Data/StatementImpl.h @@ -338,7 +338,7 @@ private: { C* pData = new C; Column* pCol = new Column(mc, pData); - return new InternalExtraction(*pData, pCol, Position(currentDataSet())); + return new InternalExtraction(*pData, pCol, Poco::UInt32(currentDataSet())); } template