diff options
| author | Brian Evans <grknight@gentoo.org> | 2017-08-24 10:02:13 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-08-24 10:41:33 -0400 |
| commit | 7f006aed315a98c65ccebc820de11131039b0dee (patch) | |
| tree | 971332d71eb8ff2d422a9617e023a75df970bc74 /dev-db/mysql-connector-c++/files | |
| parent | 5d3888269504a058648f3df0ab2cf887019cfd52 (diff) | |
| download | gentoo-7f006aed315a98c65ccebc820de11131039b0dee.tar.gz gentoo-7f006aed315a98c65ccebc820de11131039b0dee.tar.bz2 gentoo-7f006aed315a98c65ccebc820de11131039b0dee.zip | |
dev-db/mysql-connector-c++: Version bump and fix patch wrt bug 628788
MariaDB 10.2 no longer includes MARIADB_BASE_VERSION but uses
MARIADB_VERSION_ID instead.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-db/mysql-connector-c++/files')
| -rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch index a2a33e0c76db..35ed218e18dc 100644 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch @@ -5,7 +5,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp proxy->get_character_set_info(&cs); *(static_cast<int *>(optionValue)) = cs.mbmaxlen; /* mysql_get_option() was added in mysql 5.7.3 version */ -+#ifndef MARIADB_BASE_VERSION ++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) } else if ( proxy->get_server_version() >= 50703 ) { try { if (GET_CONN_OPTION(optionName, optionValue, intOptions)) { @@ -21,7 +21,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp MY_CHARSET_INFO cs; proxy->get_character_set_info(&cs); return cs.dir ? sql::SQLString(cs.dir) : ""; -+#ifndef MARIADB_BASE_VERSION ++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) } else if ( proxy->get_server_version() >= 50703 ) { const char* optionValue= NULL; if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { @@ -39,7 +39,7 @@ diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmy LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) { -#if MYSQL_VERSION_ID >= 50703 -+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) ++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) if (::mysql_get_option(mysql, option, arg)) { throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); } else { |