[arch-commits] Commit in pdns/repos (3 files)

[Douglas Soares de Andrade]

    Date: Wednesday, March 25, 2009 @ 22:30:19
  Author: douglas
Revision: 31359

Merged revisions 31358 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/pdns/trunk

........
  r31358 | douglas | 2009-03-25 23:29:29 -0300 (Qua, 25 Mar 2009) | 2 lines
  
  upgpkg: pdns 2.9.22-2
      Updating to add the mysql-options patch
........

Added:
  pdns/repos/testing-i686/2.9.18-default-mysql-options.patch
    (from rev 31358, pdns/trunk/2.9.18-default-mysql-options.patch)
Modified:
  pdns/repos/testing-i686/	(properties)
  pdns/repos/testing-i686/PKGBUILD

------------------------------------+
 2.9.18-default-mysql-options.patch |   13 +++++++++++++
 PKGBUILD                           |    2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)


Property changes on: pdns/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /pdns/trunk:1-31106
   + /pdns/trunk:1-31358

Copied: pdns/repos/testing-i686/2.9.18-default-mysql-options.patch (from rev 31358, pdns/trunk/2.9.18-default-mysql-options.patch)
===================================================================
--- testing-i686/2.9.18-default-mysql-options.patch	                        (rev 0)
+++ testing-i686/2.9.18-default-mysql-options.patch	2009-03-26 02:30:19 UTC (rev 31359)
@@ -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(),

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-26 02:29:29 UTC (rev 31358)
+++ testing-i686/PKGBUILD	2009-03-26 02:30:19 UTC (rev 31359)
@@ -3,7 +3,7 @@
 
 pkgname=pdns
 pkgver=2.9.22
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
 arch=(i686 x86_64)
 url="http://www.powerdns.com"