From owner-svn-ports-all@freebsd.org Sat May 30 08:57:01 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B888632B19C; Sat, 30 May 2020 08:57:01 +0000 (UTC) (envelope-from dinoex@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49YwKn4TLJz4Vqg; Sat, 30 May 2020 08:57:01 +0000 (UTC) (envelope-from dinoex@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 94E75260DD; Sat, 30 May 2020 08:57:01 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04U8v1nH007661; Sat, 30 May 2020 08:57:01 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04U8v1H1007660; Sat, 30 May 2020 08:57:01 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202005300857.04U8v1H1007660@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 30 May 2020 08:57:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537062 - head/databases/rubygem-mysql/files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/databases/rubygem-mysql/files X-SVN-Commit-Revision: 537062 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2020 08:57:01 -0000 Author: dinoex Date: Sat May 30 08:57:01 2020 New Revision: 537062 URL: https://svnweb.freebsd.org/changeset/ports/537062 Log: - fix build with mariadb 10.4 Modified: head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c Modified: head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c ============================================================================== --- head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c Sat May 30 08:28:29 2020 (r537061) +++ head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c Sat May 30 08:57:01 2020 (r537062) @@ -1,6 +1,50 @@ ---- ext/mysql_api/mysql.c.orig 2018-01-03 15:47:52 UTC +--- ext/mysql_api/mysql.c.orig 2020-05-29 23:08:40 UTC +++ ext/mysql_api/mysql.c -@@ -1317,7 +1317,7 @@ static VALUE stmt_bind_result(int argc, +@@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE + rb_thread_start_timer(); + #endif + ++#if MYSQL_VERSION_ID >= 100400 ++#else + myp->handler.reconnect = 0; ++#endif + myp->connection = Qtrue; + myp->query_with_result = Qtrue; + rb_obj_call_init(obj, argc, argv); +@@ -347,7 +350,10 @@ static VALUE real_connect2(int argc, VALUE* argv, VALU + #ifdef HAVE_RB_THREAD_START_TIMER + rb_thread_start_timer(); + #endif ++#if MYSQL_VERSION_ID >= 100400 ++#else + m->reconnect = 0; ++#endif + GetMysqlStruct(obj)->connection = Qtrue; + + return obj; +@@ -917,13 +923,21 @@ static VALUE query_with_result_set(VALUE obj, VALUE fl + /* reconnect() */ + static VALUE reconnect(VALUE obj) + { ++#if MYSQL_VERSION_ID >= 100400 ++ return Qfalse; ++#else + return GetHandler(obj)->reconnect ? Qtrue : Qfalse; ++#endif + } + + /* reconnect=(flag) */ + static VALUE reconnect_set(VALUE obj, VALUE flag) + { ++#if MYSQL_VERSION_ID >= 100400 ++ return Qfalse; ++#else + GetHandler(obj)->reconnect = (flag == Qnil || flag == Qfalse) ? 0 : 1; ++#endif + return flag; + } + +@@ -1317,7 +1331,7 @@ static VALUE stmt_bind_result(int argc, VALUE *argv, V } else if (argv[i] == rb_cString) s->result.bind[i].buffer_type = MYSQL_TYPE_STRING;