From nobody@FreeBSD.org  Mon Nov 22 13:14:26 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EE28716A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 22 Nov 2004 13:14:26 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DB48C43D5A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 22 Nov 2004 13:14:26 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id iAMDEQwX087786
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 22 Nov 2004 13:14:26 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id iAMDEQxI087785;
	Mon, 22 Nov 2004 13:14:26 GMT
	(envelope-from nobody)
Message-Id: <200411221314.iAMDEQxI087785@www.freebsd.org>
Date: Mon, 22 Nov 2004 13:14:26 GMT
From: Michael Hambly <mike@blackbirdsoftware.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: MySQL Navigator needs to pass a new parameter to mysql_shutdown when compiling against versions of MySQL greater than 4.1.3.
X-Send-Pr-Version: www-2.3

>Number:         74237
>Category:       ports
>Synopsis:       databases/mysql-navigator needs to pass a new parameter to mysql_shutdown when compiling against versions of MySQL greater than 4.1.3.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    demon
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 22 13:20:13 GMT 2004
>Closed-Date:    Fri Dec 31 12:08:13 GMT 2004
>Last-Modified:  Fri Dec 31 12:08:13 GMT 2004
>Originator:     Michael Hambly
>Release:        5.3
>Organization:
Blackbird Software Design Ltd.
>Environment:
5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov  5 04:19:18 UTC 2004     root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Compilation Error: In MySQL version 4.1.3 the format of the mysql_shutdown function changed. It now takes an extra argument to define the shutdown level. The MySQL Navigator code needs to check the MySQL version, and apply a default shutdown level argument when compiling against newer versions of MySQL.
>How-To-Repeat:
cd /usr/ports/databases/mysql41-server
make install clean
cd /usr/ports/databases/mysql-navigator
make install clean
>Fix:
--- src/mysql/mainwindow/mainwindowslotshutdown.cxx.orig        Mon Mar  4 21:13:22 2002
+++ src/mysql/mainwindow/mainwindowslotshutdown.cxx             Sun Nov 21 17:08:38 2004
@@ -9,7 +9,11 @@
        if(z == 1)
                return;

+#if  ( MYSQL_VERSION_ID >= 40103 && MYSQL_VERSION_ID < 50000 ) || ( MYSQL_VERSION_ID >= 50001 )
+       if(mysql_shutdown(&mysql, SHUTDOWN_DEFAULT))
+#else
        if(mysql_shutdown(&mysql))
+#endif
        {
                QMessageBox::critical(this, tr("MySQL Navigator"), QString::fromLocal8Bit(mysql_error(&mysql)));
        }

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->demon 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Nov 23 01:16:30 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74237 
State-Changed-From-To: open->closed 
State-Changed-By: demon 
State-Changed-When: Fri Dec 31 12:07:56 GMT 2004 
State-Changed-Why:  
Patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=74237 
>Unformatted:
