diff options
| author | Brian Evans <grknight@gentoo.org> | 2017-01-27 08:49:22 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-01-27 08:49:22 -0500 |
| commit | 9b3d0ae79e7ec81d1a9232ee9df06520aca333bf (patch) | |
| tree | 72785ba4615bcea2146f0c717111c2b009f65af7 /dev-db/mysql-connector-c++/files | |
| parent | 27ea1fc7b24482ca985603e245584d350a7c807c (diff) | |
| download | gentoo-9b3d0ae79e7ec81d1a9232ee9df06520aca333bf.tar.gz gentoo-9b3d0ae79e7ec81d1a9232ee9df06520aca333bf.tar.bz2 gentoo-9b3d0ae79e7ec81d1a9232ee9df06520aca333bf.zip | |
dev-db/mysql-connector-c++: Version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
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 | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 000000000000..a2a33e0c76db --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch @@ -0,0 +1,45 @@ +diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp +--- a/driver/mysql_connection.cpp 2016-12-14 04:58:54.000000000 -0500 ++++ b/driver/mysql_connection.cpp 2017-01-26 16:33:58.086005627 -0500 +@@ -1023,6 +1023,7 @@ + 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 + } else if ( proxy->get_server_version() >= 50703 ) { + try { + if (GET_CONN_OPTION(optionName, optionValue, intOptions)) { +@@ -1036,6 +1037,7 @@ + CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); + throw e; + } ++#endif + } + } + /* }}} */ +@@ -1053,11 +1055,13 @@ + MY_CHARSET_INFO cs; + proxy->get_character_set_info(&cs); + return cs.dir ? sql::SQLString(cs.dir) : ""; ++#ifndef MARIADB_BASE_VERSION + } else if ( proxy->get_server_version() >= 50703 ) { + const char* optionValue= NULL; + if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { + return optionValue ? sql::SQLString(optionValue) : ""; + } ++#endif + } + return ""; + } +diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp +--- a/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:35:46.256038741 -0500 ++++ b/driver/nativeapi/libmysql_static_proxy.cpp 2017-01-26 16:28:34.114915809 -0500 +@@ -319,7 +319,7 @@ + int + 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_get_option(mysql, option, arg)) { + throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); + } else { |