From owner-svn-ports-head@freebsd.org Sun Jan 6 19:57:19 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC5B71498EDE; Sun, 6 Jan 2019 19:57:18 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E7F18C98F; Sun, 6 Jan 2019 19:57:18 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C1705280; Sun, 6 Jan 2019 19:57:18 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x06JvIgJ069015; Sun, 6 Jan 2019 19:57:18 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x06JvIj4069014; Sun, 6 Jan 2019 19:57:18 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201901061957.x06JvIj4069014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 6 Jan 2019 19:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489527 - head/net-mgmt/pmacct/files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/net-mgmt/pmacct/files X-SVN-Commit-Revision: 489527 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5E7F18C98F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2019 19:57:19 -0000 Author: pi Date: Sun Jan 6 19:57:17 2019 New Revision: 489527 URL: https://svnweb.freebsd.org/changeset/ports/489527 Log: net-mgmt/pmacct: fix build with mariadb PR: 231345 Submitted by: Antonio.Trindade@gmail.com Added: head/net-mgmt/pmacct/files/patch-src_mysql_plugin.c (contents, props changed) Added: head/net-mgmt/pmacct/files/patch-src_mysql_plugin.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/pmacct/files/patch-src_mysql_plugin.c Sun Jan 6 19:57:17 2019 (r489527) @@ -0,0 +1,23 @@ +--- src/mysql_plugin.c.orig 2019-01-06 20:48:02.557254000 +0100 ++++ src/mysql_plugin.c 2019-01-06 20:49:11.176001000 +0100 +@@ -668,8 +668,9 @@ + MYSQL *dbptr = db->desc; + + if (!db->fail) { ++ my_bool reconnect = 1; + mysql_init(db->desc); +- dbptr->reconnect = TRUE; ++ mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect); + if (!mysql_real_connect(db->desc, host, config.sql_user, config.sql_passwd, config.sql_db, 0, NULL, 0)) { + sql_db_fail(db); + MY_get_errmsg(db); +@@ -768,5 +769,9 @@ + + void MY_mysql_get_version() + { ++#ifdef MARIADB_CLIENT_VERSION_STR ++ printf("MySQL %s\n", MARIADB_CLIENT_VERSION_STR); ++#else + printf("MySQL %s\n", MYSQL_SERVER_VERSION); ++#endif + }