Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:dliw
mysql-connector-cpp
mysql-connector-cpp-mariadb.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mysql-connector-cpp-mariadb.patch of Package mysql-connector-cpp
diff -uNr mysql-connector-c++-8.0.15-org/jdbc/cppconn/version_info.h.cmake mysql-connector-c++-8.0.15-src/jdbc/cppconn/version_info.h.cmake --- mysql-connector-c++-8.0.15-org/jdbc/cppconn/version_info.h.cmake 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/cppconn/version_info.h.cmake 2019-02-16 12:24:40.553400318 +0200 @@ -42,5 +42,6 @@ #define MYCPPCONN_STATIC_MYSQL_VERSION "@MYSQL_VERSION@" #define MYCPPCONN_STATIC_MYSQL_VERSION_ID @MYSQL_NUM_VERSION@ +#define MYCPPCONN_MARIADB_BUILD #define MYCPPCONN_BOOST_VERSION @Boost_VERSION@ diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection.cpp --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection.cpp 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection.cpp 2019-02-16 12:27:46.395921145 +0200 @@ -254,7 +254,7 @@ {OPT_CAN_HANDLE_EXPIRED_PASSWORDS, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true}, {OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_RESET, true}, {OPT_RECONNECT, MYSQL_OPT_RECONNECT, true}, -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 || defined(MYCPPCONN_MARIADB_BUILD) {"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false}, // Deprecated {"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} // Deprecated #else @@ -276,8 +276,8 @@ {OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_MAX_ALLOWED_PACKET, false}, {OPT_NET_BUFFER_LENGTH, MYSQL_OPT_NET_BUFFER_LENGTH, false}, #endif - {OPT_SSL_MODE, MYSQL_OPT_SSL_MODE , false}, -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 + //{OPT_SSL_MODE, MYSQL_OPT_SSL_MODE , false}, +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD) {OPT_RETRY_COUNT, MYSQL_OPT_RETRY_COUNT, false}, #endif }; @@ -303,7 +303,7 @@ #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700 {OPT_TLS_VERSION, MYSQL_OPT_TLS_VERSION, true}, #endif - {OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false} + //{OPT_LOAD_DATA_LOCAL_DIR, MYSQL_OPT_LOAD_DATA_LOCAL_DIR, false} }; @@ -311,7 +311,7 @@ inline ::sql::mysql::MySQL_Connection_Options option_conversion(unsigned long client_version, int option) { - #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 + #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD) if(client_version <80011) { switch (option) { @@ -593,7 +593,7 @@ int client_exp_pwd = false; bool opt_dns_srv = false; bool opt_multi_host = false; -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 || defined(MYCPPCONN_MARIADB_BUILD) bool secure_auth= true; #endif @@ -602,7 +602,7 @@ } else { throw sql::InvalidArgumentException("No string value passed for password"); } - } else if (!it->first.compare(OPT_PASSWORD1)) { + /*} else if (!it->first.compare(OPT_PASSWORD1)) { try { p_s = (it->second).get< sql::SQLString >(); } catch (sql::InvalidArgumentException&) { @@ -638,7 +638,7 @@ } else { throw sql::InvalidArgumentException("No string value passed for password3"); } - } else if (!it->first.compare(OPT_PORT)) { + */} else if (!it->first.compare(OPT_PORT)) { try { p_i = (it->second).get< int >(); } catch (sql::InvalidArgumentException&) { @@ -902,7 +902,7 @@ } catch (sql::InvalidArgumentException&) { throw sql::InvalidArgumentException("Wrong type passed for useLegacyAuth expected sql::SQLString"); } - #if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 + #if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 || defined(MYCPPCONN_MARIADB_BUILD) if (p_b) { secure_auth= !*p_b; } else { @@ -944,7 +944,7 @@ } else if (!it->first.compare(OPT_CONNECT_ATTR_RESET)) { proxy->options(MYSQL_OPT_CONNECT_ATTR_RESET, 0); - #if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 + #if MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80000 && !defined(MYCPPCONN_MARIADB_BUILD) //Deprecated } else if (!it->first.compare("sslVerify")) { @@ -961,6 +961,7 @@ throw sql::InvalidArgumentException("Wrong type passed for OPT_OCI_CONFIG_FILE. Expected sql::SQLString."); } + /* try { proxy->plugin_option(MYSQL_CLIENT_AUTHENTICATION_PLUGIN, "authentication_oci_client", @@ -972,6 +972,7 @@ OPT_OCI_CONFIG_FILE ); } + */ } else if (!it->first.compare(OPT_PLUGIN_DIR)) { @@ -1000,7 +1000,7 @@ } -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID < 80000 || defined(MYCPPCONN_MARIADB_BUILD) try { proxy->options(MYSQL_SECURE_AUTH, &secure_auth); } catch (sql::InvalidArgumentException& e) { @@ -1772,7 +1772,7 @@ #endif } else if (!optionName.compare(OPT_LOAD_DATA_LOCAL_DIR)) { - proxy->options(MYSQL_OPT_LOAD_DATA_LOCAL_DIR, optionValue); + //proxy->options(MYSQL_OPT_LOAD_DATA_LOCAL_DIR, optionValue); } return this; } diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection_options.h mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection_options.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_connection_options.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_connection_options.h 2019-02-16 12:26:42.476429900 +0200 @@ -41,7 +41,7 @@ enum MySQL_Connection_Options { -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD) MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP, MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE, @@ -86,8 +86,8 @@ MYSQL_OPT_SSL_ENFORCE, #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700 MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH, - MYSQL_OPT_TLS_VERSION, - MYSQL_OPT_SSL_MODE + MYSQL_OPT_TLS_VERSION +// MYSQL_OPT_SSL_MODE #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700 #endif //MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_resultset_metadata.h mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_resultset_metadata.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/mysql_resultset_metadata.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/mysql_resultset_metadata.h 2019-02-16 12:26:42.476429900 +0200 @@ -38,7 +38,7 @@ #include <cppconn/resultset_metadata.h> #include <cppconn/version_info.h> -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_FIELD; #else struct st_mysql_field; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/libmysql_static_proxy.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/libmysql_static_proxy.cpp --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/libmysql_static_proxy.cpp 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/libmysql_static_proxy.cpp 2019-02-16 12:26:42.476429900 +0200 @@ -326,7 +326,7 @@ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) { #if MYSQL_VERSION_ID >= 50703 - if (::mysql_get_option(mysql, option, arg)) { + if (::mysql_get_option(mysql, option, const_cast<void*>(arg))) { throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); } else { return 0; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.cpp 2019-02-16 12:28:44.323460095 +0200 @@ -97,11 +97,11 @@ case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return ::MYSQL_OPT_MAX_ALLOWED_PACKET; case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return ::MYSQL_OPT_NET_BUFFER_LENGTH; case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION; - case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE; + //case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE; #endif -#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 +#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000 && !defined(MYCPPCONN_MARIADB_BUILD) case sql::mysql::MYSQL_OPT_RETRY_COUNT: return ::MYSQL_OPT_RETRY_COUNT; case sql::mysql::MYSQL_OPT_GET_SERVER_PUBLIC_KEY: return ::MYSQL_OPT_GET_SERVER_PUBLIC_KEY; case sql::mysql::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA: return ::MYSQL_OPT_OPTIONAL_RESULTSET_METADATA; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_connection_wrapper.h 2019-02-16 12:26:42.476429900 +0200 @@ -60,7 +60,7 @@ boost::shared_ptr< IMySQLCAPI > api; -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL* mysql; #else struct st_mysql* mysql; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_resultset_wrapper.h 2019-02-16 12:26:42.480429868 +0200 @@ -38,7 +38,7 @@ #include "native_resultset_wrapper.h" #include "../cppconn/version_info.h" -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_RES; #else struct st_mysql_res; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/mysql_native_statement_wrapper.h 2019-02-16 12:26:42.480429868 +0200 @@ -38,7 +38,7 @@ #include "native_statement_wrapper.h" -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_STMT; #else struct st_mysql_stmt; diff -uNr mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/native_connection_wrapper.h mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/native_connection_wrapper.h --- mysql-connector-c++-8.0.25-src/jdbc/driver/nativeapi/native_connection_wrapper.h 2021-03-15 17:21:15.000000000 +0200 +++ mysql-connector-c++-8.0.25-mod/jdbc/driver/nativeapi/native_connection_wrapper.h 2021-05-12 15:54:14.223060673 +0300 @@ -41,7 +41,7 @@ #include "../mysql_connection_options.h" -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_BIND; #else struct st_mysql_bind; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_resultset_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_resultset_wrapper.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_resultset_wrapper.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_resultset_wrapper.h 2019-02-16 12:26:42.480429868 +0200 @@ -41,7 +41,7 @@ #include "../cppconn/version_info.h" -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_FIELD; #else struct st_mysql_field; diff -uNr mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_statement_wrapper.h mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_statement_wrapper.h --- mysql-connector-c++-8.0.15-org/jdbc/driver/nativeapi/native_statement_wrapper.h 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/driver/nativeapi/native_statement_wrapper.h 2019-02-16 12:26:42.480429868 +0200 @@ -42,7 +42,7 @@ #include "../mysql_statement_options.h" #include <cppconn/version_info.h> -#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004) +#if (MYCPPCONN_STATIC_MYSQL_VERSION_ID > 80004 && !defined(MYCPPCONN_MARIADB_BUILD)) struct MYSQL_BIND; struct MYSQL_RES; #else diff -uNr mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake --- mysql-connector-c++-8.0.15-org/jdbc/FindMySQL.cmake 2018-10-11 17:09:50.000000000 +0300 +++ mysql-connector-c++-8.0.15-src/jdbc/FindMySQL.cmake 2019-02-16 12:26:42.480429868 +0200 @@ -505,6 +505,8 @@ "\"${MYSQL_CONFIG_EXECUTABLE}\"") endif() + list(GET MYSQL_INCLUDE_DIR 0 MYSQL_INCLUDE_DIR) + if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h") message(FATAL_ERROR "Could not find \"mysql.h\" in \"${MYSQL_INCLUDE_DIR}\" " "found from running \"${MYSQL_CONFIG_EXECUTABLE}\"")
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
