Date: Sat, 11 Mar 2023 18:44:00 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4cb2610f4524 - main - databases/rubygem-mysql: fix runtime error with mariadb 10.4 and above Message-ID: <202303111844.32BIi0ZL086159@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cb2610f45243a8454e6e940f218c82f8bdd1b21 commit 4cb2610f45243a8454e6e940f218c82f8bdd1b21 Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2023-03-11 18:43:50 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2023-03-11 18:43:50 +0000 databases/rubygem-mysql: fix runtime error with mariadb 10.4 and above --- databases/rubygem-mysql/Makefile | 1 + .../rubygem-mysql/files/patch-ext-mysql_api-mysql.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile index 28d99ce0528f..d0a20eb92c53 100644 --- a/databases/rubygem-mysql/Makefile +++ b/databases/rubygem-mysql/Makefile @@ -1,5 +1,6 @@ PORTNAME= mysql PORTVERSION= 2.9.1 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c index b7f8cf385303..ce59e04255ac 100644 --- a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c +++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c @@ -1,4 +1,4 @@ ---- ext/mysql_api/mysql.c.orig 2022-03-10 04:04:50 UTC +--- ext/mysql_api/mysql.c.orig 2023-03-11 18:29:50 UTC +++ ext/mysql_api/mysql.c @@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE rb_thread_start_timer(); @@ -68,3 +68,19 @@ s->result.bind[i].buffer_type = MYSQL_TYPE_LONGLONG; else if (argv[i] == rb_cFloat) s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE; +@@ -1884,6 +1898,7 @@ static VALUE error_sqlstate(VALUE obj) + + void Init_mysql_api(void) + { ++#if 0 + int i; + int dots = 0; + const char *lib = mysql_get_client_info(); +@@ -1898,6 +1913,7 @@ void Init_mysql_api(void) + return; + } + } ++#endif + + cMysql = rb_define_class("Mysql", rb_cObject); + cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303111844.32BIi0ZL086159>