File mysql-workbench-mariadb-8.0.15.patch of Package mysql-workbench
diff -uNr mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQL.cmake mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQL.cmake
--- mysql-workbench-community-8.0.15-org/build/cmake/Modules/FindMySQL.cmake 2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/build/cmake/Modules/FindMySQL.cmake 2019-02-16 13:56:53.711465800 +0200
@@ -72,8 +72,10 @@
)
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 "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.15-org/plugins/migration/copytable/copytable.cpp mysql-workbench-community-8.0.15-src/plugins/migration/copytable/copytable.cpp
--- mysql-workbench-community-8.0.15-org/plugins/migration/copytable/copytable.cpp 2019-01-30 15:32:36.000000000 +0200
+++ mysql-workbench-community-8.0.15-src/plugins/migration/copytable/copytable.cpp 2019-02-16 13:57:00.203423071 +0200
@@ -324,7 +324,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;
@@ -2264,6 +2264,8 @@
*(*_row_buffer)[col_index].length);
_bulk_insert_record.append("')");
break;
+ case MAX_NO_FIELD_TYPES:
+ break;
}
}
@@ -2651,7 +2653,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