summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2005-07-17 08:46:08 +0000
committerSven Wegener <swegener@gentoo.org>2005-07-17 08:46:08 +0000
commit5b740294927af01057beb493f89db12a3b76f0dd (patch)
treea47e2a7d1b3c9794a5835d6e11c2a32f9a2cdec1 /net-dns/pdns/files
parentcleanup (diff)
downloadgentoo-2-5b740294927af01057beb493f89db12a3b76f0dd.tar.gz
gentoo-2-5b740294927af01057beb493f89db12a3b76f0dd.tar.bz2
gentoo-2-5b740294927af01057beb493f89db12a3b76f0dd.zip
Added a small patch that makes pdns load the default mysql options from my.cnf.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-dns/pdns/files')
-rw-r--r--net-dns/pdns/files/2.9.18-default-mysql-options.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/net-dns/pdns/files/2.9.18-default-mysql-options.patch b/net-dns/pdns/files/2.9.18-default-mysql-options.patch
new file mode 100644
index 000000000000..a9048e13e10d
--- /dev/null
+++ b/net-dns/pdns/files/2.9.18-default-mysql-options.patch
@@ -0,0 +1,13 @@
+diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
+--- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc 2005-04-23 23:40:15.000000000 +0200
++++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc 2005-07-17 10:38:35.363597586 +0200
+@@ -15,6 +15,9 @@
+ const string &password)
+ {
+ mysql_init(&d_db);
++#if MYSQL_VERSION_ID > 32349
++ mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
++#endif
+ if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(),
+ user.empty() ? 0 : user.c_str(),
+ password.empty() ? 0 : password.c_str(),