Skip to content

Commit 853311c

Browse files
lawrinlawrin
lawrin
authored and
lawrin
committed
Version bumped to 1.1.2
Other minor changes in this patch: - Link to refman page in MSI's arpprops changed from 5.5 to universal link to the latest version - in tests framework removed filter check before test run as it was buggy - removed stray variabe in mysql_warning.cpp
1 parent ade5884 commit 853311c

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
#
44
# The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -205,7 +205,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
205205
"Connector/C++, a library for connecting to MySQL servers.")
206206
SET(CPACK_PACKAGE_VERSION_MAJOR 1)
207207
SET(CPACK_PACKAGE_VERSION_MINOR 1)
208-
SET(CPACK_PACKAGE_VERSION_PATCH 1)
208+
SET(CPACK_PACKAGE_VERSION_PATCH 2)
209209
SET(CPACK_PACKAGE_RELEASE_TYPE "")
210210
SET(CPACK_PACKAGE_VENDOR "Oracle and/or its affiliates")
211211
SET(CPACK_RPM_PACKAGE_DESCRIPTION

‎driver/mysql_driver.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
44
The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -130,19 +130,20 @@ sql::Connection * MySQL_Driver::connect(sql::ConnectOptionsMap & properties)
130130
}
131131

132132

133+
//TODO: That has to be defined in cmake files
133134
int MySQL_Driver::getMajorVersion()
134135
{
135136
return 1;
136137
}
137138

138139
int MySQL_Driver::getMinorVersion()
139140
{
140-
return 0;
141+
return 1;
141142
}
142143

143144
int MySQL_Driver::getPatchVersion()
144145
{
145-
return 6;
146+
return 2;
146147
}
147148

148149
const sql::SQLString & MySQL_Driver::getName()

‎driver/mysql_warning.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
44
The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -240,8 +240,6 @@ loadMysqlWarnings(sql::Connection * connection, unsigned int warningsCount)
240240
{
241241
MySQL_Warning * first = NULL, * current = NULL;
242242
SQLString state;
243-
unsigned int count;
244-
245243

246244
if (warningsCount >0 && connection != NULL) {
247245
boost::scoped_ptr< sql::Statement > stmt(connection->createStatement());
@@ -256,9 +254,9 @@ loadMysqlWarnings(sql::Connection * connection, unsigned int warningsCount)
256254
if (current == NULL) {
257255
first = current = new MySQL_Warning(sql::SQLString(rset->getString(3)), errCode2SqlState(errCode, state), errCode);
258256
} else {
259-
MySQL_Warning * tmp = new MySQL_Warning(sql::SQLString(rset->getString(3)), errCode2SqlState(errCode, state), errCode);
257+
MySQL_Warning * tmp= new MySQL_Warning(sql::SQLString(rset->getString(3)), errCode2SqlState(errCode, state), errCode);
260258
current->setNextWarning(tmp);
261-
current = tmp;
259+
current= tmp;
262260
}
263261
}
264262
}

‎test/framework/test_factory.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
44
The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -51,6 +51,7 @@ Test * TestSuiteFactory::createTest( const String::value_type * name )
5151
return NULL;
5252
}
5353

54+
5455
int TestSuiteFactory::RegisterTestSuite(const String::value_type * name, TestSuiteCreator creator)
5556
{
5657
TestSuiteFactory::theInstance().testSuites.insert(std::make_pair(name
@@ -70,6 +71,7 @@ List::size_type TestSuiteFactory::getTestsList( std::vector<const String::value_
7071
return list.size();
7172
}
7273

74+
7375
TestSuiteFactory::~TestSuiteFactory()
7476
{
7577
for ( TestSuites::iterator it= testSuites.begin(); it != testSuites.end(); ++it )

‎test/framework/test_filter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
44
The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -31,7 +31,7 @@ namespace testsuite
3131
{
3232

3333
static const char * wildCardCharacter= "*";
34-
// We suppose we receive trimmed dtring here
34+
// We suppose we receive trimmed string here
3535
SingleFilter::SingleFilter( const String & filterStr
3636
, const String & NOTsymbol /*= "!"*/ )
3737
{

‎test/framework/test_runner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
33
44
The MySQL Connector/C++ is licensed under the terms of the GPLv2
55
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -57,7 +57,7 @@ bool TestsRunner::runTests()
5757
dummy= *cit;
5858
dummy+= "::"; // to be caught by filters like "!SuiteName::*"
5959

60-
if ( Admits( dummy ) )
60+
if ( 1 ) //TestsWillRunCount( suiteName, testCases )( dummy ) )
6161
{
6262
Test * ts= TestSuiteFactory::theInstance().createTest( *cit );
6363
ts->runTest();

‎win/mysql-conncpp-msi-arpprops.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Property Id="ARPURLINFOABOUT" Value="http://dev.mysql.com/downloads/connector/cpp/" />
77
<Property Id="ARPURLUPDATEINFO" Value="http://dev.mysql.com/downloads/connector/cpp/" />
88
<!--Property Id="ARPHELPTELEPHONE" Value="URL where one can find support phone numbers" /-->
9-
<Property Id="ARPAUTHORIZEDCDFPREFIX" Value="http://dev.mysql.com/doc/refman/5.5/en/connector-cpp.html" />
9+
<Property Id="ARPAUTHORIZEDCDFPREFIX" Value="http://dev.mysql.com/doc/en/connector-cpp.html" />
1010
<Property Id="ARPSIZE" Value="3" />
1111

1212
<!--

0 commit comments

Comments
 (0)