From 98b3ec76cb3c3f70a2e94d23cbf2e07461a75840 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Mon, 17 Jan 2005 11:26:39 +0000
Subject: Fix build with mysql >= 4.1.3.

---
 databases/kmysqladmin/distinfo         |  3 ++-
 databases/kmysqladmin/patches/patch-ad | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 databases/kmysqladmin/patches/patch-ad

(limited to 'databases/kmysqladmin')

diff --git a/databases/kmysqladmin/distinfo b/databases/kmysqladmin/distinfo
index 7a97646d22a..a569914c1f4 100644
--- a/databases/kmysqladmin/distinfo
+++ b/databases/kmysqladmin/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/12/27 23:35:01 markd Exp $
+$NetBSD: distinfo,v 1.5 2005/01/17 11:26:39 markd Exp $
 
 SHA1 (kmysqladmin-0.7.0.tar.gz) = b01cb4a19669a11eb22c9f2a0ed44c6891734987
 Size (kmysqladmin-0.7.0.tar.gz) = 1315939 bytes
 SHA1 (patch-aa) = e3327d1992f70534b20af4be5e9698038dff13e1
 SHA1 (patch-ab) = d7fd4b73cecbe03c20efbdf89981738cc6fa7c19
 SHA1 (patch-ac) = 284e490aa24eeaacb80f2df1c3da1ab32594de20
+SHA1 (patch-ad) = 8bc762f9cbde7c1db2f131ed5cd23220f3649bdb
diff --git a/databases/kmysqladmin/patches/patch-ad b/databases/kmysqladmin/patches/patch-ad
new file mode 100644
index 00000000000..ba38cbde92c
--- /dev/null
+++ b/databases/kmysqladmin/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.4 2005/01/17 11:26:39 markd Exp $
+
+--- kmysqladmin/backend/my_sql/my_sql.cpp.orig	2004-09-22 14:53:03.000000000 +1200
++++ kmysqladmin/backend/my_sql/my_sql.cpp
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <mysql_com.h>
++#include <mysql_version.h>
+ #include <cmath>
+ #include <iostream>
+ 
+@@ -1184,7 +1185,11 @@ int CMySql::shutdown()
+     int i;
+     if (!Sql_Connection)
+         return 0;
+-    i = mysql_shutdown(Sql_Connection);
++    i = mysql_shutdown(Sql_Connection
++#if MYSQL_VERSION_ID >= 40103
++	, SHUTDOWN_DEFAULT
++#endif
++	);
+     if (i < 0) {
+         do_message(get_last_error());
+     }
-- 
cgit v1.2.3