Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2018-02-06 16:49:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old) and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench" Tue Feb 6 16:49:16 2018 rev:49 rq:573120 version:6.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2017-12-12 21:25:08.020159376 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2018-02-06 16:49:18.163651248 +0100 @@ -1,0 +2,8 @@ +Mon Feb 5 14:14:51 UTC 2018 - [email protected] + +- add mysql-workbench-mariadb.patch + to fix compatibility with MariaDB, + removed not supported options, + added HAVE_CHARSET_... not used mariadb connector + +------------------------------------------------------------------- New: ---- mysql-workbench-mariadb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.zikma7/_old 2018-02-06 16:49:19.251600341 +0100 +++ /var/tmp/diff_new_pack.zikma7/_new 2018-02-06 16:49:19.255600154 +0100 @@ -1,7 +1,7 @@ # # spec file for package mysql-workbench # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,7 +46,8 @@ # patch from https://bugs.mysql.com/bug.php?id=84886 Patch11: git_patch_105207009.patch # Patch from https://git.archlinux.org/svntogit/community.git/tree/trunk/0005-gdal-use-CPLFree.patch?h=packages/mysql-workbench -Patch1700: mysql-workbench-gdal-use-CPLFree.patch +Patch12: mysql-workbench-gdal-use-CPLFree.patch +Patch13: mysql-workbench-mariadb.patch BuildRequires: Mesa-devel BuildRequires: ant BuildRequires: binutils-gold @@ -139,7 +140,8 @@ #patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch1700 -p1 +%patch12 -p1 +%patch13 -p1 %build export CFLAGS="%{optflags}" ++++++ mysql-workbench-mariadb.patch ++++++ diff -uNr mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp --- mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp 2017-11-09 18:11:42.000000000 +0200 +++ mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp 2018-02-05 11:51:59.083657042 +0200 @@ -297,7 +297,7 @@ if (properties.find("OPT_READ_TIMEOUT") == properties.end()) properties["OPT_READ_TIMEOUT"] = read_timeout; } - 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 @@ -324,7 +324,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) { @@ -344,7 +344,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-6.3.10-src.org/library/sql.parser/source/my_config.h mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h --- mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h 1970-01-01 03:00:00.000000000 +0300 +++ mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h 2018-02-05 14:09:01.328469741 +0200 @@ -0,0 +1,44 @@ +// include everything from system my_config.h +#include_next <my_config.h> + +// add charsets for workbench +#define HAVE_CHARSET_armscii8 1 +#define HAVE_CHARSET_ascii 1 +#define HAVE_CHARSET_big5 1 +#define HAVE_CHARSET_cp1250 1 +#define HAVE_CHARSET_cp1251 1 +#define HAVE_CHARSET_cp1256 1 +#define HAVE_CHARSET_cp1257 1 +#define HAVE_CHARSET_cp850 1 +#define HAVE_CHARSET_cp852 1 +#define HAVE_CHARSET_cp866 1 +#define HAVE_CHARSET_cp932 1 +#define HAVE_CHARSET_dec8 1 +#define HAVE_CHARSET_eucjpms 1 +#define HAVE_CHARSET_euckr 1 +#define HAVE_CHARSET_gb2312 1 +#define HAVE_CHARSET_gbk 1 +#define HAVE_CHARSET_geostd8 1 +#define HAVE_CHARSET_greek 1 +#define HAVE_CHARSET_hebrew 1 +#define HAVE_CHARSET_hp8 1 +#define HAVE_CHARSET_keybcs2 1 +#define HAVE_CHARSET_koi8r 1 +#define HAVE_CHARSET_koi8u 1 +#define HAVE_CHARSET_latin1 1 +#define HAVE_CHARSET_latin2 1 +#define HAVE_CHARSET_latin5 1 +#define HAVE_CHARSET_latin7 1 +#define HAVE_CHARSET_macce 1 +#define HAVE_CHARSET_macroman 1 +#define HAVE_CHARSET_sjis 1 +#define HAVE_CHARSET_swe7 1 +#define HAVE_CHARSET_tis620 1 +#define HAVE_CHARSET_ucs2 1 +#define HAVE_CHARSET_ujis 1 +#define HAVE_CHARSET_utf8mb4 1 +#define HAVE_CHARSET_utf8mb3 1 +#define HAVE_CHARSET_utf8 1 +#define HAVE_CHARSET_utf16 1 +#define HAVE_CHARSET_utf32 1 +#define HAVE_UCA_COLLATIONS 1
