Date: Mon, 22 Nov 2004 13:14:26 GMT From: Michael Hambly <mike@blackbirdsoftware.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/74237: MySQL Navigator needs to pass a new parameter to mysql_shutdown when compiling against versions of MySQL greater than 4.1.3. Message-ID: <200411221314.iAMDEQxI087785@www.freebsd.org> Resent-Message-ID: <200411221320.iAMDKEMj096704@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74237
>Category: ports
>Synopsis: 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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 22 13:20:13 GMT 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411221314.iAMDEQxI087785>