build_config.h   build_config.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reser ved. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_BUILD_CONFIG_H_ #ifndef _SQL_BUILD_CONFIG_H_
#define _SQL_BUILD_CONFIG_H_ #define _SQL_BUILD_CONFIG_H_
#ifndef CPPCONN_PUBLIC_FUNC #ifndef CPPCONN_PUBLIC_FUNC
#if defined(_WIN32) #if defined(_WIN32)
// mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib buil d only // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib buil d only
#ifdef mysqlcppconn_EXPORTS #ifdef mysqlcppconn_EXPORTS
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 config.h   config.h 
/* /*
Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reser ved. Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reser ved.
The MySQL Connector/C++ is licensed under the terms of the GPL The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPL as it is applied to this software, see the conditions of the GPL as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILI
TY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
// libmysql defines HAVE_STRTOUL (on win), so we have to follow different p attern in definitions names // libmysql defines HAVE_STRTOUL (on win), so we have to follow different p attern in definitions names
// to avoid annoying warnings. // to avoid annoying warnings.
#define HAVE_FUNCTION_STRTOLD 1 #define HAVE_FUNCTION_STRTOLD 1
#define HAVE_FUNCTION_STRTOLL 1 #define HAVE_FUNCTION_STRTOLL 1
#define HAVE_FUNCTION_STRTOL 1 #define HAVE_FUNCTION_STRTOL 1
#define HAVE_FUNCTION_STRTOULL 1 #define HAVE_FUNCTION_STRTOULL 1
skipping to change at line 58 skipping to change at line 71
#include <stdint.h> #include <stdint.h>
#endif #endif
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
#ifndef CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES #ifndef CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES
#if _MSC_VER >= 1600
#include <stdint.h>
#else
#if !defined(HAVE_INT8_T) && defined(HAVE_MS_INT8) #if !defined(HAVE_INT8_T) && defined(HAVE_MS_INT8)
typedef __int8 int8_t; typedef __int8 int8_t;
#endif #endif
#ifdef HAVE_MS_UINT8 #ifdef HAVE_MS_UINT8
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
#endif #endif
#ifdef HAVE_MS_INT16 #ifdef HAVE_MS_INT16
typedef __int16 int16_t; typedef __int16 int16_t;
#endif #endif
skipping to change at line 88 skipping to change at line 107
typedef unsigned __int32 uint32_t; typedef unsigned __int32 uint32_t;
#endif #endif
#ifdef HAVE_MS_INT64 #ifdef HAVE_MS_INT64
typedef __int64 int64_t; typedef __int64 int64_t;
#endif #endif
#ifdef HAVE_MS_UINT64 #ifdef HAVE_MS_UINT64
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
#endif #endif
#endif // _MSC_VER >= 1600
#endif // CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES #endif // CPPCONN_DONT_TYPEDEF_MS_TYPES_TO_C99_TYPES
#endif // _WIN32 #endif // _WIN32
 End of changes. 4 change blocks. 
1 lines changed or deleted 22 lines changed or added


 connection.h   connection.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reser ved. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_CONNECTION_H_ #ifndef _SQL_CONNECTION_H_
#define _SQL_CONNECTION_H_ #define _SQL_CONNECTION_H_
#include <map> #include <map>
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include "build_config.h" #include "build_config.h"
#include "warning.h" #include "warning.h"
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 datatype.h   datatype.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_DATATYPE_H_ #ifndef _SQL_DATATYPE_H_
#define _SQL_DATATYPE_H_ #define _SQL_DATATYPE_H_
namespace sql namespace sql
{ {
class DataType class DataType
{ {
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 driver.h   driver.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_DRIVER_H_ #ifndef _SQL_DRIVER_H_
#define _SQL_DRIVER_H_ #define _SQL_DRIVER_H_
#include "connection.h" #include "connection.h"
#include "build_config.h" #include "build_config.h"
namespace sql namespace sql
{ {
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 exception.h   exception.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_EXCEPTION_H_ #ifndef _SQL_EXCEPTION_H_
#define _SQL_EXCEPTION_H_ #define _SQL_EXCEPTION_H_
#include "build_config.h" #include "build_config.h"
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <memory> #include <memory>
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 metadata.h   metadata.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_METADATA_H_ #ifndef _SQL_METADATA_H_
#define _SQL_METADATA_H_ #define _SQL_METADATA_H_
#include <string> #include <string>
#include <list> #include <list>
#include "datatype.h" #include "datatype.h"
#include "sqlstring.h" #include "sqlstring.h"
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 mysql_connection.h   mysql_connection.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _MYSQL_CONNECTION_H_ #ifndef _MYSQL_CONNECTION_H_
#define _MYSQL_CONNECTION_H_ #define _MYSQL_CONNECTION_H_
#include <cppconn/connection.h> #include <cppconn/connection.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace sql namespace sql
{ {
skipping to change at line 146 skipping to change at line 146
void setHoldability(int holdability); void setHoldability(int holdability);
void setReadOnly(bool readOnly); void setReadOnly(bool readOnly);
sql::Savepoint * setSavepoint(); sql::Savepoint * setSavepoint();
sql::Savepoint * setSavepoint(const sql::SQLString& name); sql::Savepoint * setSavepoint(const sql::SQLString& name);
void setTransactionIsolation(enum_transaction_isolation level); void setTransactionIsolation(enum_transaction_isolation level);
sql::SQLString getSessionVariable(const sql::SQLString & varname); virtual sql::SQLString getSessionVariable(const sql::SQLString & var name);
void setSessionVariable(const sql::SQLString & varname, const sql::S virtual void setSessionVariable(const sql::SQLString & varname, cons
QLString & value); t sql::SQLString & value);
virtual sql::SQLString getLastStatementInfo();
protected: protected:
void checkClosed(); void checkClosed();
void init(std::map< sql::SQLString, sql::ConnectPropertyVal > & prop erties); void init(std::map< sql::SQLString, sql::ConnectPropertyVal > & prop erties);
Driver * driver; Driver * driver;
boost::shared_ptr< NativeAPI::NativeConnectionWrapper > proxy; boost::shared_ptr< NativeAPI::NativeConnectionWrapper > proxy;
MySQL_ConnectionData * intern; /* pimpl */ MySQL_ConnectionData * intern; /* pimpl */
 End of changes. 4 change blocks. 
24 lines changed or deleted 25 lines changed or added


 mysql_driver.h   mysql_driver.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _MYSQL_DRIVER_H_ #ifndef _MYSQL_DRIVER_H_
#define _MYSQL_DRIVER_H_ #define _MYSQL_DRIVER_H_
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <cppconn/driver.h> #include <cppconn/driver.h>
extern "C" extern "C"
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 parameter_metadata.h   parameter_metadata.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_PARAMETER_METADATA_H_ #ifndef _SQL_PARAMETER_METADATA_H_
#define _SQL_PARAMETER_METADATA_H_ #define _SQL_PARAMETER_METADATA_H_
#include <cppconn/sqlstring.h> #include <cppconn/sqlstring.h>
namespace sql namespace sql
{ {
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 prepared_statement.h   prepared_statement.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_PREPARED_STATEMENT_H_ #ifndef _SQL_PREPARED_STATEMENT_H_
#define _SQL_PREPARED_STATEMENT_H_ #define _SQL_PREPARED_STATEMENT_H_
#include <iostream> #include <iostream>
#include "statement.h" #include "statement.h"
namespace sql namespace sql
{ {
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 resultset.h   resultset.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_RESULTSET_H_ #ifndef _SQL_RESULTSET_H_
#define _SQL_RESULTSET_H_ #define _SQL_RESULTSET_H_
#include "config.h" #include "config.h"
#include <list> #include <list>
#include <map> #include <map>
#include <iostream> #include <iostream>
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 resultset_metadata.h   resultset_metadata.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_RESULTSET_METADATA_H_ #ifndef _SQL_RESULTSET_METADATA_H_
#define _SQL_RESULTSET_METADATA_H_ #define _SQL_RESULTSET_METADATA_H_
#include "sqlstring.h" #include "sqlstring.h"
#include "datatype.h" #include "datatype.h"
namespace sql namespace sql
{ {
skipping to change at line 76 skipping to change at line 76
virtual bool isAutoIncrement(unsigned int column) = 0; virtual bool isAutoIncrement(unsigned int column) = 0;
virtual bool isCaseSensitive(unsigned int column) = 0; virtual bool isCaseSensitive(unsigned int column) = 0;
virtual bool isCurrency(unsigned int column) = 0; virtual bool isCurrency(unsigned int column) = 0;
virtual bool isDefinitelyWritable(unsigned int column) = 0; virtual bool isDefinitelyWritable(unsigned int column) = 0;
virtual int isNullable(unsigned int column) = 0; virtual int isNullable(unsigned int column) = 0;
virtual bool isNumeric(unsigned int column) = 0;
virtual bool isReadOnly(unsigned int column) = 0; virtual bool isReadOnly(unsigned int column) = 0;
virtual bool isSearchable(unsigned int column) = 0; virtual bool isSearchable(unsigned int column) = 0;
virtual bool isSigned(unsigned int column) = 0; virtual bool isSigned(unsigned int column) = 0;
virtual bool isWritable(unsigned int column) = 0; virtual bool isWritable(unsigned int column) = 0;
virtual bool isZerofill(unsigned int column) = 0; virtual bool isZerofill(unsigned int column) = 0;
 End of changes. 3 change blocks. 
21 lines changed or deleted 22 lines changed or added


 sqlstring.h   sqlstring.h 
/* /*
Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_STRING_H_ #ifndef _SQL_STRING_H_
#define _SQL_STRING_H_ #define _SQL_STRING_H_
#include <string> #include <string>
#include "build_config.h" #include "build_config.h"
#include <iostream> #include <iostream>
namespace sql namespace sql
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 statement.h   statement.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_STATEMENT_H_ #ifndef _SQL_STATEMENT_H_
#define _SQL_STATEMENT_H_ #define _SQL_STATEMENT_H_
#include "config.h" #include "config.h"
#include "resultset.h" #include "resultset.h"
#include <string> #include <string>
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added


 warning.h   warning.h 
/* /*
Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserv ed. Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved .
The MySQL Connector/C++ is licensed under the terms of the GPLv2 The MySQL Connector/C++ is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
MySQL Connectors. There are special exceptions to the terms and MySQL Connectors. There are special exceptions to the terms and
conditions of the GPLv2 as it is applied to this software, see the conditions of the GPLv2 as it is applied to this software, see the
FLOSS License Exception FLOSS License Exception
<http://www.mysql.com/about/legal/licensing/foss-exception.html>. <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published it under the terms of the GNU General Public License as published
by the Free Software Foundation; version 2 of the License. by the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILIT WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Y or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
for more details.
You should have received a copy of the GNU General Public License along
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc.,
with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _SQL_WARNING_H_ #ifndef _SQL_WARNING_H_
#define _SQL_WARNING_H_ #define _SQL_WARNING_H_
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <memory> #include <memory>
#include "sqlstring.h" #include "sqlstring.h"
 End of changes. 2 change blocks. 
21 lines changed or deleted 20 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/