diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-02-07 18:44:41 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-02-08 21:17:22 +0100 |
| commit | bd2cf6d0b58c6ea48f59fb7640898ccd9e2aa7f6 (patch) | |
| tree | bd0e3927a6d7e03cc16128e5cb2ec77cbf634728 /dev-db/mysql-connector-c++/files | |
| parent | 55607b7a7df85b1fa818b3ed717fd48dc4278214 (diff) | |
| download | gentoo-bd2cf6d0b58c6ea48f59fb7640898ccd9e2aa7f6.tar.gz gentoo-bd2cf6d0b58c6ea48f59fb7640898ccd9e2aa7f6.tar.bz2 gentoo-bd2cf6d0b58c6ea48f59fb7640898ccd9e2aa7f6.zip | |
dev-db/mysql-connector-c++: drop 1.1.12-r2
Bug: https://bugs.gentoo.org/834439
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-db/mysql-connector-c++/files')
| -rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch | 43 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch | 23 |
2 files changed, 0 insertions, 66 deletions
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch deleted file mode 100644 index 2868a3c024af..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/driver/mysql_connection.cpp -+++ b/driver/mysql_connection.cpp -@@ -1067,6 +1067,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti - proxy->get_character_set_info(&cs); - *(static_cast<int *>(optionValue)) = cs.mbmaxlen; - /* mysql_get_option() was added in mysql 5.7.3 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)) { -@@ -1080,6 +1081,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti - CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); - throw e; - } -+#endif - } - } - /* }}} */ -@@ -1097,11 +1099,13 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName) - MY_CHARSET_INFO cs; - proxy->get_character_set_info(&cs); - return cs.dir ? sql::SQLString(cs.dir) : ""; -+#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)) { - return optionValue ? sql::SQLString(optionValue) : ""; - } -+#endif - } - return ""; - } ---- a/driver/nativeapi/libmysql_static_proxy.cpp -+++ b/driver/nativeapi/libmysql_static_proxy.cpp -@@ -325,7 +325,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void - 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 ) && !defined ( MARIADB_VERSION_ID ) - if (::mysql_get_option(mysql, option, arg)) { - throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); - } else { diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch deleted file mode 100644 index 18d4e9a80410..000000000000 --- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -aurN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2015-06-04 08:58:30.000000000 -0400 -+++ b/CMakeLists.txt 2015-07-21 10:41:59.081091000 -0400 -@@ -300,7 +300,7 @@ - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") - ENDIF(WIN32) - --SET(DOC_DESTINATION ".") -+SET(DOC_DESTINATION ${INSTALL_DOCS}) - IF(RPM_LAYOUT) - SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}") - ENDIF() -@@ -373,10 +373,6 @@ - ADD_SUBDIRECTORY(cppconn) - ADD_SUBDIRECTORY(driver) - ADD_SUBDIRECTORY(examples) --ADD_SUBDIRECTORY(test) --ADD_SUBDIRECTORY(test/framework) --ADD_SUBDIRECTORY(test/CJUnitTestsPort) --ADD_SUBDIRECTORY(test/unit) - - IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") - # see also README |
