Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:marec2000:server:database
mysql-workbench
mysql-workbench-mariadb.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mysql-workbench-mariadb.patch of Package mysql-workbench
diff -uNr mysql-workbench-community-8.0.19-org/build/cmake/Modules/FindMySQL.cmake mysql-workbench-community-8.0.19-src/build/cmake/Modules/FindMySQL.cmake --- mysql-workbench-community-8.0.19-org/build/cmake/Modules/FindMySQL.cmake 2020-04-05 00:00:02.702291848 +0300 +++ mysql-workbench-community-8.0.19-src/build/cmake/Modules/FindMySQL.cmake 2020-04-05 00:02:04.761297658 +0300 @@ -72,8 +72,8 @@ ) find_file(MySQL_VERSION_FILE mysql_version.h ${MySQL_INCLUDE_DIRS}) - file(STRINGS "${MySQL_VERSION_FILE}" MySQL_VERSION_LINE REGEX "MYSQL_SERVER_VERSION") - string(REGEX REPLACE "#define MYSQL_SERVER_VERSION[ \t]+\"([0-9.]+)\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}") + file(STRINGS "${MySQL_VERSION_FILE}" MySQL_VERSION_LINE REGEX "MARIADB_CLIENT_VERSION_STR") + string(REGEX REPLACE "#define MARIADB_CLIENT_VERSION_STR[ \t]+\"([0-9.]+)\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}") # Find the library: set(MySQL_LIBRARY_NAMES mysqlclient mysqlclient_r) diff -uNr mysql-workbench-community-8.0.33-org/library/cdbc/src/driver_manager.cpp mysql-workbench-community-8.0.33-src/library/cdbc/src/driver_manager.cpp --- mysql-workbench-community-8.0.33-org/library/cdbc/src/driver_manager.cpp 2023-03-24 16:37:47.000000000 +0100 +++ mysql-workbench-community-8.0.33-src/library/cdbc/src/driver_manager.cpp 2023-06-06 21:17:41.847510066 +0200 @@ -346,7 +346,7 @@ properties["defaultAuth"] = ""; } - properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true; + //properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true; properties["CLIENT_MULTI_STATEMENTS"] = true; properties["metadataUseInfoSchema"] = false; // I_S is way too slow for many things as of MySQL 5.6.10, so disable it for now @@ -373,7 +373,7 @@ properties.erase("sslCipher"); } - ssize_t sslModeWb = parameter_values.get_int("useSSL", 0); + /*ssize_t sslModeWb = parameter_values.get_int("useSSL", 0); sql::ssl_mode sslMode = sql::SSL_MODE_DISABLED; switch (sslModeWb) { case 0: @@ -393,7 +393,7 @@ sslMode = sql::SSL_MODE_VERIFY_IDENTITY; break; } - properties["OPT_SSL_MODE"] = sslMode; + properties["OPT_SSL_MODE"] = sslMode;*/ // If we are on a pipe connection then set the host name explicitly. // However, pipe connections can only be established on the local box (Win only). diff -uNr mysql-workbench-community-8.0.33-org/plugins/migration/copytable/copytable.cpp mysql-workbench-community-8.0.33-src/plugins/migration/copytable/copytable.cpp --- mysql-workbench-community-8.0.33-org/plugins/migration/copytable/copytable.cpp 2023-03-24 16:37:47.000000000 +0100 +++ mysql-workbench-community-8.0.33-src/plugins/migration/copytable/copytable.cpp 2023-06-06 21:25:31.493609701 +0200 @@ -339,7 +339,7 @@ base::strfmt("Unhandled MySQL type %i for column '%s'", col->target_type, col->target_name.c_str())); } -#if MYSQL_VERSION_ID >= 80004 +#if MYSQL_VERSION_ID >= 80004 && !defined(MARIADB_BASE_VERSION) typedef bool WB_BOOL; #else typedef my_bool WB_BOOL; @@ -1238,12 +1238,12 @@ mysql_options(&_mysql, MYSQL_OPT_CONNECT_TIMEOUT, &_connection_timeout); -#if MYSQL_VERSION_ID >= 80004 +#if MYSQL_VERSION_ID >= 80004 && !defined(MARIADB_BASE_VERSION) if (use_cleartext_plugin) logWarning("Trying to use the ClearText plugin, but it's not supported by libmysqlclient\n"); #else - #if MYSQL_VERSION_ID >= 50527 + #if MYSQL_VERSION_ID >= 50527 && !defined(MARIADB_BASE_VERSION) my_bool use_cleartext = use_cleartext_plugin; mysql_options(&_mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, &use_cleartext); #else @@ -1794,7 +1794,7 @@ mysql_init(&_mysql); -#if MYSQL_VERSION_ID >= 50606 +#if MYSQL_VERSION_ID >= 50606 && !defined(MARIADB_BASE_VERSION) if (is_mysql_version_at_least(5, 6, 6)) mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); #endif @@ -1827,12 +1827,12 @@ mysql_options(&_mysql, MYSQL_OPT_CONNECT_TIMEOUT, &_connection_timeout); -#if MYSQL_VERSION_ID >= 80004 +#if MYSQL_VERSION_ID >= 80004 && !defined(MARIADB_BASE_VERSION) if (use_cleartext_plugin) logWarning("Trying to use the ClearText plugin, but it's not supported by libmysqlclient\n"); #else - #if MYSQL_VERSION_ID >= 50527 + #if MYSQL_VERSION_ID >= 50527 && !defined(MARIADB_BASE_VERSION) my_bool use_cleartext = use_cleartext_plugin; mysql_options(&_mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, &use_cleartext); #else @@ -2270,12 +2270,12 @@ _bulk_insert_record.append("'", 1); break; -#if MYSQL_VERSION_ID > 50600 +#if MYSQL_VERSION_ID > 50600 && !defined(MARIADB_BASE_VERSION) case MYSQL_TYPE_TIMESTAMP2: case MYSQL_TYPE_DATETIME2: case MYSQL_TYPE_TIME2: #endif -#if MYSQL_VERSION_ID > 80016 +#if MYSQL_VERSION_ID > 80016 && !defined(MARIADB_BASE_VERSION) case MYSQL_TYPE_TYPED_ARRAY: /* Used only for replication. */ #endif // TODO: implement handling @@ -2290,7 +2290,7 @@ *(*_row_buffer)[col_index].length); _bulk_insert_record.append("')"); break; -#if MYSQL_VERSION_ID > 80021 +#if MYSQL_VERSION_ID > 80021 && !defined(MARIADB_BASE_VERSION) case MYSQL_TYPE_INVALID: // TODO: added to fix the build. Need to check how to handle this. break; @@ -2686,7 +2686,7 @@ -#if MYSQL_VERSION_ID >= 50706 +#if MYSQL_VERSION_ID >= 50706 && !defined(MARIADB_BASE_VERSION) if (_target->is_mysql_version_at_least(5, 7, 6)) ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '\''); else
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