Made an otherwise annoying error message helpful.

PKGREVISION++ because there are user-visible changes.

3 files changed, 29 insertions, 8 deletions

diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 160c8974d5b..05af6d67a60 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:32 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/11/03 18:53:11 rillig Exp $
 
 DISTNAME=	kmysqladmin-0.7.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 
diff --git a/databases/kmysqladmin/distinfo b/databases/kmysqladmin/distinfo
index 77481d7bf26..4256aa93512 100644
--- a/databases/kmysqladmin/distinfo
+++ b/databases/kmysqladmin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/03/28 18:07:52 joerg Exp $
+$NetBSD: distinfo,v 1.8 2007/11/03 18:53:11 rillig Exp $
 
 SHA1 (kmysqladmin-0.7.0.tar.gz) = b01cb4a19669a11eb22c9f2a0ed44c6891734987
 RMD160 (kmysqladmin-0.7.0.tar.gz) = 1af15d1c7dadbb48fbbb9c467a53ae294b2dcb17
@@ -6,6 +6,6 @@ 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
+SHA1 (patch-ad) = b71cda5286b772eb068f4324323c86f01d7fe665
 SHA1 (patch-ae) = cbf90098f4808bc9101e7d345ac4eee6dcf6fadf
 SHA1 (patch-af) = bb36a6402d9ba28a73c01203fe282f93ccd654ae
diff --git a/databases/kmysqladmin/patches/patch-ad b/databases/kmysqladmin/patches/patch-ad
index ba38cbde92c..62d29436b4e 100644
--- a/databases/kmysqladmin/patches/patch-ad
+++ b/databases/kmysqladmin/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2005/01/17 11:26:39 markd Exp $
+$NetBSD: patch-ad,v 1.5 2007/11/03 18:53:12 rillig Exp $
 
---- kmysqladmin/backend/my_sql/my_sql.cpp.orig	2004-09-22 14:53:03.000000000 +1200
-+++ kmysqladmin/backend/my_sql/my_sql.cpp
+--- kmysqladmin/backend/my_sql/my_sql.cpp.orig	2004-09-22 04:53:03.000000000 +0200
++++ kmysqladmin/backend/my_sql/my_sql.cpp	2007-09-26 22:55:12.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -10,7 +10,28 @@ $NetBSD: patch-ad,v 1.4 2005/01/17 11:26:39 markd Exp $
  #include <cmath>
  #include <iostream>
  
-@@ -1184,7 +1185,11 @@ int CMySql::shutdown()
+@@ -70,6 +71,7 @@ const my_sql_type CMySql::f_arr[]=
+         my_sql_type("DATETIME","DateTime",                14, 14,0,0,false,false,false,false,false,false,false,false),
+         my_sql_type("YEAR","Year",                         4,  4,0,0, true,false,false,false,false,false,false,false),
+         my_sql_type("DOUBLE","Double (8 Bytes)",           1, 20,0,8, true, true, true,false,false, true,false,false),
++        my_sql_type("DOUBLE UNSIGNED", "Double (8 Bytes)", 1, 20,0,8, true, true, true, true,false, true,false,false),
+         my_sql_type("NUMERIC","Decimal (lenght,dec)",      1, 20,0,8, true, true, true,false, true, true,false,false),
+     };
+ 
+@@ -469,8 +471,10 @@ bool CMySql::get_table_fields(const std:
+             }
+         }
+         if (f_type == FieldDescriptCounts()) {
+-            do_message("Error retrieving fieldtypes - please send a mail to the "
+-                       "autor of the software!");
++            std::string msg = "Unknown MySQL type ";
++            msg += type_string;
++            msg += " - please send a mail to the author of the software!";
++            do_message(msg);
+             return false;
+         }
+         my_sql_type t_info = sql_type(f_type);
+@@ -1184,7 +1188,11 @@ int CMySql::shutdown()
      int i;
      if (!Sql_Connection)
          return 0;