mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-24 01:42:13 +08:00
3f8df78cad
- switch to gtk3 - port patch from opensuse to compile with system mariadb - update various upstream python packages and C++ packages + python-paramiko, python-pytest + vsqlite++, mysqlconnector++
79 lines
3.1 KiB
Diff
79 lines
3.1 KiB
Diff
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
|