auto-handle.hxx   auto-handle.hxx 
// file : odb/mysql/auto-handle.hxx // file : odb/mysql/auto-handle.hxx
// author : Constantin Michael <constantin@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_AUTO_HANDLE_HXX #ifndef ODB_MYSQL_AUTO_HANDLE_HXX
#define ODB_MYSQL_AUTO_HANDLE_HXX #define ODB_MYSQL_AUTO_HANDLE_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
#include <odb/mysql/mysql.hxx> #include <odb/mysql/mysql.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 binding.hxx   binding.hxx 
// file : odb/mysql/binding.hxx // file : odb/mysql/binding.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_BINDING_HXX #ifndef ODB_MYSQL_BINDING_HXX
#define ODB_MYSQL_BINDING_HXX #define ODB_MYSQL_BINDING_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <odb/forward.hxx> #include <odb/forward.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 config.h   config.h 
/* odb/mysql/details/config.h. Generated from config.h.in by configure. * / /* odb/mysql/details/config.h. Generated from config.h.in by configure. * /
/* file : odb/mysql/details/config.h.in /* file : odb/mysql/details/config.h.in
* author : Boris Kolpackov <boris@codesynthesis.com> * copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
* copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
* license : GNU GPL v2; see accompanying LICENSE file * license : GNU GPL v2; see accompanying LICENSE file
*/ */
/* This file is automatically processed by configure. */ /* This file is automatically processed by configure. */
#ifndef ODB_MYSQL_DETAILS_CONFIG_H #ifndef ODB_MYSQL_DETAILS_CONFIG_H
#define ODB_MYSQL_DETAILS_CONFIG_H #define ODB_MYSQL_DETAILS_CONFIG_H
/* #undef LIBODB_MYSQL_STATIC_LIB */ /* #undef LIBODB_MYSQL_STATIC_LIB */
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 config.hxx   config.hxx 
// file : odb/mysql/details/config.hxx // file : odb/mysql/details/config.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_DETAILS_CONFIG_HXX #ifndef ODB_MYSQL_DETAILS_CONFIG_HXX
#define ODB_MYSQL_DETAILS_CONFIG_HXX #define ODB_MYSQL_DETAILS_CONFIG_HXX
// no pre // no pre
#ifdef _MSC_VER #ifdef _MSC_VER
# if !defined(LIBODB_MYSQL_INCLUDE_SHORT) && !defined (LIBODB_MYSQL_INCLUD E_LONG) # if !defined(LIBODB_MYSQL_INCLUDE_SHORT) && !defined (LIBODB_MYSQL_INCLUD E_LONG)
# define LIBODB_MYSQL_INCLUDE_SHORT 1 # define LIBODB_MYSQL_INCLUDE_SHORT 1
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 connection-factory.hxx   connection-factory.hxx 
// file : odb/mysql/connection-factory.hxx // file : odb/mysql/connection-factory.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_CONNECTION_FACTORY_HXX #ifndef ODB_MYSQL_CONNECTION_FACTORY_HXX
#define ODB_MYSQL_CONNECTION_FACTORY_HXX #define ODB_MYSQL_CONNECTION_FACTORY_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <vector> #include <vector>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 connection.hxx   connection.hxx 
// file : odb/mysql/connection.hxx // file : odb/mysql/connection.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_CONNECTION_HXX #ifndef ODB_MYSQL_CONNECTION_HXX
#define ODB_MYSQL_CONNECTION_HXX #define ODB_MYSQL_CONNECTION_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <vector> #include <vector>
#include <memory> // std::auto_ptr #include <memory> // std::auto_ptr
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 container-statements.hxx   container-statements.hxx 
// file : odb/mysql/container-statements.hxx // file : odb/mysql/container-statements.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_CONTAINER_STATEMENTS_HXX #ifndef ODB_MYSQL_CONTAINER_STATEMENTS_HXX
#define ODB_MYSQL_CONTAINER_STATEMENTS_HXX #define ODB_MYSQL_CONTAINER_STATEMENTS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <odb/forward.hxx> #include <odb/forward.hxx>
skipping to change at line 160 skipping to change at line 159
{ {
return data_image_binding_; return data_image_binding_;
} }
my_bool* my_bool*
data_image_truncated () data_image_truncated ()
{ {
return data_image_truncated_; return data_image_truncated_;
} }
binding&
select_image_binding ()
{
return select_image_binding_;
}
my_bool*
select_image_truncated ()
{
return select_image_truncated_;
}
// //
// Statements. // Statements.
// //
insert_statement_type& insert_statement_type&
insert_one_statement () insert_one_statement ()
{ {
if (insert_one_ == 0) if (insert_one_ == 0)
insert_one_.reset ( insert_one_.reset (
new (details::shared) insert_statement_type ( new (details::shared) insert_statement_type (
skipping to change at line 184 skipping to change at line 195
select_statement_type& select_statement_type&
select_all_statement () select_all_statement ()
{ {
if (select_all_ == 0) if (select_all_ == 0)
select_all_.reset ( select_all_.reset (
new (details::shared) select_statement_type ( new (details::shared) select_statement_type (
conn_, conn_,
select_all_text_, select_all_text_,
cond_image_binding_, cond_image_binding_,
data_image_binding_, select_image_binding_,
false)); false));
return *select_all_; return *select_all_;
} }
delete_statement_type& delete_statement_type&
delete_all_statement () delete_all_statement ()
{ {
if (delete_all_ == 0) if (delete_all_ == 0)
delete_all_.reset ( delete_all_.reset (
skipping to change at line 215 skipping to change at line 226
protected: protected:
connection_type& conn_; connection_type& conn_;
functions_type functions_; functions_type functions_;
const binding* id_binding_; const binding* id_binding_;
cond_image_type cond_image_; cond_image_type cond_image_;
std::size_t cond_image_version_; std::size_t cond_image_version_;
std::size_t cond_id_binding_version_; std::size_t cond_id_binding_version_;
binding cond_image_binding_; binding cond_image_binding_;
MYSQL_BIND* cond_image_bind_;
data_image_type data_image_; data_image_type data_image_;
std::size_t data_image_version_; std::size_t data_image_version_;
std::size_t data_id_binding_version_; std::size_t data_id_binding_version_;
binding data_image_binding_; binding data_image_binding_;
MYSQL_BIND* data_image_bind_;
my_bool* data_image_truncated_; my_bool* data_image_truncated_;
// Skips the id from data_image_binding.
//
binding select_image_binding_;
my_bool* select_image_truncated_;
const char* insert_one_text_; const char* insert_one_text_;
const char* select_all_text_; const char* select_all_text_;
const char* delete_all_text_; const char* delete_all_text_;
details::shared_ptr<insert_statement_type> insert_one_; details::shared_ptr<insert_statement_type> insert_one_;
details::shared_ptr<select_statement_type> select_all_; details::shared_ptr<select_statement_type> select_all_;
details::shared_ptr<delete_statement_type> delete_all_; details::shared_ptr<delete_statement_type> delete_all_;
}; };
// Template argument is the generated concrete container traits type. // Template argument is the generated concrete container traits type.
skipping to change at line 250 skipping to change at line 265
typedef typename T::statements_type base; typedef typename T::statements_type base;
typedef mysql::connection connection_type; typedef mysql::connection connection_type;
container_statements_impl (connection_type&); container_statements_impl (connection_type&);
private: private:
container_statements_impl (const container_statements_impl&); container_statements_impl (const container_statements_impl&);
container_statements_impl& operator= (const container_statements_impl &); container_statements_impl& operator= (const container_statements_impl &);
private: private:
MYSQL_BIND cond_image_bind_array_[traits::cond_column_count]; MYSQL_BIND cond_image_bind_[traits::cond_column_count];
MYSQL_BIND data_image_bind_array_[traits::data_column_count]; MYSQL_BIND data_image_bind_[traits::data_column_count];
my_bool data_image_truncated_array_[traits::data_column_count]; my_bool data_image_truncated_array_[traits::data_column_count];
}; };
} }
} }
#include <odb/mysql/container-statements.txx> #include <odb/mysql/container-statements.txx>
#include <odb/post.hxx> #include <odb/post.hxx>
#endif // ODB_MYSQL_CONTAINER_STATEMENTS_HXX #endif // ODB_MYSQL_CONTAINER_STATEMENTS_HXX
 End of changes. 8 change blocks. 
7 lines changed or deleted 22 lines changed or added


 container-statements.txx   container-statements.txx 
// file : odb/mysql/container-statements.txx // file : odb/mysql/container-statements.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <cstring> // std::memset #include <cstring> // std::memset
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
// container_statements // container_statements
skipping to change at line 25 skipping to change at line 24
template <typename T> template <typename T>
container_statements<T>:: container_statements<T>::
container_statements (connection_type& conn) container_statements (connection_type& conn)
: conn_ (conn), : conn_ (conn),
functions_ (this, functions_ (this,
&traits::insert_one, &traits::insert_one,
&traits::load_all, &traits::load_all,
&traits::delete_all), &traits::delete_all),
id_binding_ (0), id_binding_ (0),
cond_image_binding_ (0, 0), // Initialized by impl. cond_image_binding_ (0, 0), // Initialized by impl.
data_image_binding_ (0, 0) // Initialized by impl. data_image_binding_ (0, 0), // Initialized by impl.
select_image_binding_ (0, 0) // Initialized by impl.
{ {
cond_image_.version = 0; cond_image_.version = 0;
cond_image_version_ = 0; cond_image_version_ = 0;
cond_id_binding_version_ = 0; cond_id_binding_version_ = 0;
data_image_.version = 0; data_image_.version = 0;
data_image_version_ = 0; data_image_version_ = 0;
data_id_binding_version_ = 0; data_id_binding_version_ = 0;
} }
template <typename T> template <typename T>
container_statements_impl<T>:: container_statements_impl<T>::
container_statements_impl (connection_type& conn) container_statements_impl (connection_type& conn)
: base (conn) : base (conn)
{ {
this->cond_image_bind_ = cond_image_bind_array_;
this->data_image_bind_ = data_image_bind_array_;
this->data_image_truncated_ = data_image_truncated_array_; this->data_image_truncated_ = data_image_truncated_array_;
this->select_image_truncated_ = data_image_truncated_array_ +
traits::id_column_count;
this->cond_image_binding_.bind = this->cond_image_bind_; this->cond_image_binding_.bind = cond_image_bind_;
this->cond_image_binding_.count = traits::cond_column_count; this->cond_image_binding_.count = traits::cond_column_count;
this->data_image_binding_.bind = this->data_image_bind_; this->data_image_binding_.bind = data_image_bind_;
this->data_image_binding_.count = traits::data_column_count; this->data_image_binding_.count = traits::data_column_count;
std::memset (cond_image_bind_array_, 0, sizeof (cond_image_bind_array this->select_image_binding_.bind = data_image_bind_ +
_)); traits::id_column_count;
std::memset (data_image_bind_array_, 0, sizeof (data_image_bind_array this->select_image_binding_.count = traits::data_column_count -
_)); traits::id_column_count;
std::memset (cond_image_bind_, 0, sizeof (cond_image_bind_));
std::memset (data_image_bind_, 0, sizeof (data_image_bind_));
std::memset (data_image_truncated_array_, std::memset (data_image_truncated_array_,
0, 0,
sizeof (data_image_truncated_array_)); sizeof (data_image_truncated_array_));
for (std::size_t i (0); i < traits::data_column_count; ++i) for (std::size_t i (0); i < traits::data_column_count; ++i)
data_image_bind_array_[i].error = data_image_truncated_array_ + i; data_image_bind_[i].error = data_image_truncated_array_ + i;
this->insert_one_text_ = traits::insert_one_statement; this->insert_one_text_ = traits::insert_one_statement;
this->select_all_text_ = traits::select_all_statement; this->select_all_text_ = traits::select_all_statement;
this->delete_all_text_ = traits::delete_all_statement; this->delete_all_text_ = traits::delete_all_statement;
} }
} }
} }
 End of changes. 8 change blocks. 
13 lines changed or deleted 16 lines changed or added


 database.hxx   database.hxx 
// file : odb/mysql/database.hxx // file : odb/mysql/database.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_DATABASE_HXX #ifndef ODB_MYSQL_DATABASE_HXX
#define ODB_MYSQL_DATABASE_HXX #define ODB_MYSQL_DATABASE_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <string> #include <string>
#include <memory> // std::auto_ptr #include <memory> // std::auto_ptr
#include <iosfwd> // std::ostream #include <iosfwd> // std::ostream
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 database.ixx   database.ixx 
// file : odb/mysql/database.ixx // file : odb/mysql/database.ixx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
inline connection_ptr database:: inline connection_ptr database::
connection () connection ()
{ {
// Go through the virtual connection_() function instead of // Go through the virtual connection_() function instead of
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 enum.hxx   enum.hxx 
// file : odb/mysql/enums.hxx // file : odb/mysql/enums.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_ENUMS_HXX #ifndef ODB_MYSQL_ENUMS_HXX
#define ODB_MYSQL_ENUMS_HXX #define ODB_MYSQL_ENUMS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <cstring> // std::memmove #include <cstring> // std::memmove
#include <cassert> #include <cassert>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 error.hxx   error.hxx 
// file : odb/mysql/error.hxx // file : odb/mysql/error.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_ERROR_HXX #ifndef ODB_MYSQL_ERROR_HXX
#define ODB_MYSQL_ERROR_HXX #define ODB_MYSQL_ERROR_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/mysql/mysql.hxx> #include <odb/mysql/mysql.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 exceptions.hxx   exceptions.hxx 
// file : odb/mysql/exceptions.hxx // file : odb/mysql/exceptions.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_EXCEPTIONS_HXX #ifndef ODB_MYSQL_EXCEPTIONS_HXX
#define ODB_MYSQL_EXCEPTIONS_HXX #define ODB_MYSQL_EXCEPTIONS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <string> #include <string>
#include <odb/exceptions.hxx> #include <odb/exceptions.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 export.hxx   export.hxx 
// file : odb/mysql/details/export.hxx // file : odb/mysql/details/export.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_DETAILS_EXPORT_HXX #ifndef ODB_MYSQL_DETAILS_EXPORT_HXX
#define ODB_MYSQL_DETAILS_EXPORT_HXX #define ODB_MYSQL_DETAILS_EXPORT_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/mysql/details/config.hxx> #include <odb/mysql/details/config.hxx>
#ifdef LIBODB_MYSQL_STATIC_LIB #ifdef LIBODB_MYSQL_STATIC_LIB
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 forward.hxx   forward.hxx 
// file : odb/mysql/forward.hxx // file : odb/mysql/forward.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_FORWARD_HXX #ifndef ODB_MYSQL_FORWARD_HXX
#define ODB_MYSQL_FORWARD_HXX #define ODB_MYSQL_FORWARD_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/forward.hxx> #include <odb/forward.hxx>
namespace odb namespace odb
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 mysql-types.hxx   mysql-types.hxx 
// file : odb/mysql/mysql-types.hxx // file : odb/mysql/mysql-types.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_MYSQL_TYPES_HXX #ifndef ODB_MYSQL_MYSQL_TYPES_HXX
#define ODB_MYSQL_MYSQL_TYPES_HXX #define ODB_MYSQL_MYSQL_TYPES_HXX
#include <odb/mysql/details/config.hxx> #include <odb/mysql/details/config.hxx>
typedef char my_bool; typedef char my_bool;
typedef struct st_mysql_bind MYSQL_BIND; typedef struct st_mysql_bind MYSQL_BIND;
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 mysql.hxx   mysql.hxx 
// file : odb/mysql/mysql.hxx // file : odb/mysql/mysql.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_MYSQL_HXX #ifndef ODB_MYSQL_MYSQL_HXX
#define ODB_MYSQL_MYSQL_HXX #define ODB_MYSQL_MYSQL_HXX
#include <odb/mysql/details/config.hxx> #include <odb/mysql/details/config.hxx>
#include <odb/mysql/mysql-types.hxx> #include <odb/mysql/mysql-types.hxx>
#ifdef _WIN32 #ifdef _WIN32
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 object-result.hxx   object-result.hxx 
// file : odb/mysql/object-result.hxx // file : odb/mysql/object-result.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_OBJECT_RESULT_HXX #ifndef ODB_MYSQL_OBJECT_RESULT_HXX
#define ODB_MYSQL_OBJECT_RESULT_HXX #define ODB_MYSQL_OBJECT_RESULT_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <odb/details/shared-ptr.hxx> #include <odb/details/shared-ptr.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 object-result.txx   object-result.txx 
// file : odb/mysql/object-result.txx // file : odb/mysql/object-result.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <cassert>
#include <odb/callback.hxx> #include <odb/callback.hxx>
#include <odb/exceptions.hxx> #include <odb/exceptions.hxx>
#include <odb/mysql/object-statements.hxx> #include <odb/mysql/object-statements.hxx>
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
// //
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 object-statements.hxx   object-statements.hxx 
// file : odb/mysql/object-statements.hxx // file : odb/mysql/object-statements.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_OBJECT_STATEMENTS_HXX #ifndef ODB_MYSQL_OBJECT_STATEMENTS_HXX
#define ODB_MYSQL_OBJECT_STATEMENTS_HXX #define ODB_MYSQL_OBJECT_STATEMENTS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 object-statements.ixx   object-statements.ixx 
// file : odb/mysql/object-statements.ixx // file : odb/mysql/object-statements.ixx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
// //
// auto_unlock // auto_unlock
// //
inline object_statements_base::auto_unlock:: inline object_statements_base::auto_unlock::
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 object-statements.txx   object-statements.txx 
// file : odb/mysql/object-statements.txx // file : odb/mysql/object-statements.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <cstring> // std::memset #include <cstring> // std::memset
#include <odb/session.hxx> #include <odb/session.hxx>
#include <odb/callback.hxx> #include <odb/callback.hxx>
#include <odb/exceptions.hxx> #include <odb/exceptions.hxx>
#include <odb/mysql/connection.hxx> #include <odb/mysql/connection.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 query.hxx   query.hxx 
// file : odb/mysql/query.hxx // file : odb/mysql/query.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_QUERY_HXX #ifndef ODB_MYSQL_QUERY_HXX
#define ODB_MYSQL_QUERY_HXX #define ODB_MYSQL_QUERY_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <string> #include <string>
#include <vector> #include <vector>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 query.ixx   query.ixx 
// file : odb/mysql/query.ixx // file : odb/mysql/query.ixx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
template <typename T, database_type_id ID> template <typename T, database_type_id ID>
inline void query:: inline void query::
append (val_bind<T> v) append (val_bind<T> v)
{ {
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 query.txx   query.txx 
// file : odb/mysql/query.txx // file : odb/mysql/query.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
// query // query
// //
template <database_type_id ID> template <database_type_id ID>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 result.hxx   result.hxx 
// file : odb/mysql/result.hxx // file : odb/mysql/result.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_RESULT_HXX #ifndef ODB_MYSQL_RESULT_HXX
#define ODB_MYSQL_RESULT_HXX #define ODB_MYSQL_RESULT_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/traits.hxx> #include <odb/traits.hxx>
#include <odb/result.hxx> #include <odb/result.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 statement-cache.hxx   statement-cache.hxx 
// file : odb/mysql/statement-cache.hxx // file : odb/mysql/statement-cache.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_STATEMENT_CACHE_HXX #ifndef ODB_MYSQL_STATEMENT_CACHE_HXX
#define ODB_MYSQL_STATEMENT_CACHE_HXX #define ODB_MYSQL_STATEMENT_CACHE_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <map> #include <map>
#include <typeinfo> #include <typeinfo>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 statement.hxx   statement.hxx 
// file : odb/mysql/statement.hxx // file : odb/mysql/statement.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_STATEMENT_HXX #ifndef ODB_MYSQL_STATEMENT_HXX
#define ODB_MYSQL_STATEMENT_HXX #define ODB_MYSQL_STATEMENT_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <string> #include <string>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 statements-base.hxx   statements-base.hxx 
// file : odb/mysql/statements-base.hxx // file : odb/mysql/statements-base.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_STATEMENTS_BASE_HXX #ifndef ODB_MYSQL_STATEMENTS_BASE_HXX
#define ODB_MYSQL_STATEMENTS_BASE_HXX #define ODB_MYSQL_STATEMENTS_BASE_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/details/shared-ptr.hxx> #include <odb/details/shared-ptr.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 tracer.hxx   tracer.hxx 
// file : odb/mysql/tracer.hxx // file : odb/mysql/tracer.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_TRACER_HXX #ifndef ODB_MYSQL_TRACER_HXX
#define ODB_MYSQL_TRACER_HXX #define ODB_MYSQL_TRACER_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/tracer.hxx> #include <odb/tracer.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 traits.hxx   traits.hxx 
// file : odb/mysql/traits.hxx // file : odb/mysql/traits.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_TRAITS_HXX #ifndef ODB_MYSQL_TRAITS_HXX
#define ODB_MYSQL_TRAITS_HXX #define ODB_MYSQL_TRAITS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <string> #include <string>
#include <vector> #include <vector>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 transaction-impl.hxx   transaction-impl.hxx 
// file : odb/mysql/transaction-impl.hxx // file : odb/mysql/transaction-impl.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_TRANSACTION_IMPL_HXX #ifndef ODB_MYSQL_TRANSACTION_IMPL_HXX
#define ODB_MYSQL_TRANSACTION_IMPL_HXX #define ODB_MYSQL_TRANSACTION_IMPL_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/transaction.hxx> #include <odb/transaction.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 transaction-impl.ixx   transaction-impl.ixx 
// file : odb/mysql/transaction-impl.ixx // file : odb/mysql/transaction-impl.ixx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
inline transaction_impl::connection_type& transaction_impl:: inline transaction_impl::connection_type& transaction_impl::
connection () connection ()
{ {
return *connection_; return *connection_;
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 transaction.hxx   transaction.hxx 
// file : odb/mysql/transaction.hxx // file : odb/mysql/transaction.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_TRANSACTION_HXX #ifndef ODB_MYSQL_TRANSACTION_HXX
#define ODB_MYSQL_TRANSACTION_HXX #define ODB_MYSQL_TRANSACTION_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/transaction.hxx> #include <odb/transaction.hxx>
#include <odb/mysql/version.hxx> #include <odb/mysql/version.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 transaction.ixx   transaction.ixx 
// file : odb/mysql/transaction.ixx // file : odb/mysql/transaction.ixx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <odb/mysql/database.hxx> #include <odb/mysql/database.hxx>
#include <odb/mysql/transaction-impl.hxx> #include <odb/mysql/transaction-impl.hxx>
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
inline transaction:: inline transaction::
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 version.hxx   version.hxx 
// file : odb/mysql/version.hxx // file : odb/mysql/version.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_VERSION_HXX #ifndef ODB_MYSQL_VERSION_HXX
#define ODB_MYSQL_VERSION_HXX #define ODB_MYSQL_VERSION_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <odb/mysql/details/config.hxx> #include <odb/mysql/details/config.hxx>
#ifdef LIBODB_MYSQL_INCLUDE_SHORT #ifdef LIBODB_MYSQL_INCLUDE_SHORT
skipping to change at line 40 skipping to change at line 39
// Version AABBCCDD // Version AABBCCDD
// 2.0.0 02000000 // 2.0.0 02000000
// 2.1.0 02010000 // 2.1.0 02010000
// 2.1.1 02010100 // 2.1.1 02010100
// 2.2.0.a1 02019901 // 2.2.0.a1 02019901
// 3.0.0.b2 02999952 // 3.0.0.b2 02999952
// //
// Check that we have compatible ODB version. // Check that we have compatible ODB version.
// //
#if ODB_VERSION != 10700 #if ODB_VERSION != 10800
# error incompatible odb interface version detected # error incompatible odb interface version detected
#endif #endif
// Check that we have a compatible MySQL version (5.0.3 or later). // Check that we have a compatible MySQL version (5.0.3 or later).
// //
#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID < 50003 #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID < 50003
# error incompatible MySQL version detected # error incompatible MySQL version detected
#endif #endif
// libodb-mysql version: odb interface version plus the bugfix // libodb-mysql version: odb interface version plus the bugfix
// version. // version.
// //
#define LIBODB_MYSQL_VERSION 1070000 #define LIBODB_MYSQL_VERSION 1080000
#define LIBODB_MYSQL_VERSION_STR "1.7.0" #define LIBODB_MYSQL_VERSION_STR "1.8.0"
#include <odb/post.hxx> #include <odb/post.hxx>
#endif // ODB_MYSQL_VERSION_HXX #endif // ODB_MYSQL_VERSION_HXX
 End of changes. 3 change blocks. 
5 lines changed or deleted 4 lines changed or added


 view-result.hxx   view-result.hxx 
// file : odb/mysql/view-result.hxx // file : odb/mysql/view-result.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_VIEW_RESULT_HXX #ifndef ODB_MYSQL_VIEW_RESULT_HXX
#define ODB_MYSQL_VIEW_RESULT_HXX #define ODB_MYSQL_VIEW_RESULT_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <odb/details/shared-ptr.hxx> #include <odb/details/shared-ptr.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 view-result.txx   view-result.txx 
// file : odb/mysql/view-result.txx // file : odb/mysql/view-result.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <odb/callback.hxx> #include <odb/callback.hxx>
#include <odb/exceptions.hxx> #include <odb/exceptions.hxx>
#include <odb/mysql/view-statements.hxx> #include <odb/mysql/view-statements.hxx>
namespace odb namespace odb
{ {
namespace mysql namespace mysql
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 view-statements.hxx   view-statements.hxx 
// file : odb/mysql/view-statements.hxx // file : odb/mysql/view-statements.hxx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#ifndef ODB_MYSQL_VIEW_STATEMENTS_HXX #ifndef ODB_MYSQL_VIEW_STATEMENTS_HXX
#define ODB_MYSQL_VIEW_STATEMENTS_HXX #define ODB_MYSQL_VIEW_STATEMENTS_HXX
#include <odb/pre.hxx> #include <odb/pre.hxx>
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <odb/forward.hxx> #include <odb/forward.hxx>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 view-statements.txx   view-statements.txx 
// file : odb/mysql/view-statements.txx // file : odb/mysql/view-statements.txx
// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : Copyright (c) 2005-2012 Code Synthesis Tools CC
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : GNU GPL v2; see accompanying LICENSE file // license : GNU GPL v2; see accompanying LICENSE file
#include <cstddef> // std::size_t #include <cstddef> // std::size_t
#include <cstring> // std::memset #include <cstring> // std::memset
namespace odb namespace odb
{ {
namespace mysql namespace mysql
{ {
template <typename T> template <typename T>
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 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/