summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2005-06-17 18:11:13 +0000
committerSven Wegener <swegener@gentoo.org>2005-06-17 18:11:13 +0000
commit4073772d2fbf45762f31b6e49ffc57264ab6e225 (patch)
tree7827cad5b6b6f1d87f8bdd8b479598344e5c01bb /dev-db/mysql-query-browser/files
parentFixed patch and added inherit eutils for epatch support. (diff)
downloadgentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.tar.gz
gentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.tar.bz2
gentoo-2-4073772d2fbf45762f31b6e49ffc57264ab6e225.zip
Also apply the mysql-4.0 patch from mysql-administrator to mysql-query-browser, bug #96399.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-db/mysql-query-browser/files')
-rw-r--r--dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch b/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch
new file mode 100644
index 000000000000..4e0be6f73f70
--- /dev/null
+++ b/dev-db/mysql-query-browser/files/1.1.11-optional-4.1-support.patch
@@ -0,0 +1,16 @@
+diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c
+--- mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c 2005-06-06 16:12:15.000000000 +0200
++++ mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c 2005-06-17 16:02:40.579309365 +0200
+@@ -581,10 +581,12 @@
+ //of mysql_real_connect are in utf8
+ //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+
++#if MYSQL_VERSION_ID >= 40100
+ if (myx_mysql_get_private(mysql)->embedded)
+ mysql_options(mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION, (char *)1);
+ else
+ mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
++#endif
+
+ if (!mysql_real_connect(mysql, user_conn->hostname, user_conn->username,
+ user_conn->password, user_conn->schema,