#At bzr+ssh://ahristov@stripped/bzrroot/public/connector-cpp-bzr/trunk/
197 andrey.hristov@stripped 2008-10-30
More debug
Fix bug - don't pass testsuite::ResultSet by value, as it is std::auto_ptr and the
auto_ptr
will be shallow copied. When the copy gets destroyed the pointer is invalidated.
modified:
driver/mysql_statement.cpp
test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp
test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.h
=== modified file 'driver/mysql_statement.cpp'
--- a/driver/mysql_statement.cpp 2008-10-28 20:04:19 +0000
+++ b/driver/mysql_statement.cpp 2008-10-30 13:29:42 +0000
@@ -111,6 +111,7 @@ MySQL_Statement::execute(const std::stri
{
CPP_ENTER("MySQL_Statement::execute");
CPP_INFO_FMT("this=%p", this);
+ CPP_INFO_FMT("query=%s", sql.c_str());
checkClosed();
do_query(sql.c_str(), static_cast<int>(sql.length()));
bool ret = mysql_field_count(connection->getMySQLHandle()) > 0;
=== modified file 'test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp'
--- a/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp 2008-10-13 12:37:16 +0000
+++ b/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp 2008-10-30 13:29:42 +0000
@@ -3099,9 +3099,8 @@ String tmp("%");
bool test_status = true;
logMsg("Calling DatabaseMetaData.getTableTypes");
-
+
ResultSet oRet_ResultSet(dbmd->getTableTypes());
-
String sRetStr ;
sRetStr = "";
test_status = columnCompare(sColumnNames, oRet_ResultSet);
@@ -9220,7 +9219,7 @@ std::list< String > tmp2;
/* A private method to compare the Column Names & No of Columns Specific to the
test */
/* throws SQLException */
- bool DatabaseMetaDataTest::columnCompare(List & sColumnNames, ResultSet rs)
+ bool DatabaseMetaDataTest::columnCompare(List & sColumnNames, ResultSet & rs)
{
bool test_status = false;
bool statusColumnCount = true;
=== modified file 'test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.h'
--- a/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.h 2008-10-17 10:11:08 +0000
+++ b/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.h 2008-10-30 13:29:42 +0000
@@ -42,7 +42,7 @@ namespace compliance
/* throws sql::DbcException */
- bool columnCompare(List & sColumnNames, ResultSet rs) ;
+ bool columnCompare(List & sColumnNames, ResultSet & rs) ;
protected:
/**
| Thread |
|---|
| • bzr commit into connector-cpp-bzr branch (andrey.hristov:197) | andrey.hristov | 30 Oct |