diff --git a/databases/tdbc-mysql/Makefile b/databases/tdbc-mysql/Makefile index a2acd0a39e4..b43bfd0e6b7 100644 --- a/databases/tdbc-mysql/Makefile +++ b/databases/tdbc-mysql/Makefile @@ -1,6 +1,6 @@ COMMENT = MariaDB module for TDBC -V = 1.1.3 +V = 1.1.5 N = mysql DISTNAME = tdbc${N}${V} diff --git a/databases/tdbc-mysql/distinfo b/databases/tdbc-mysql/distinfo index 387a93a2f5d..7ca52393e8a 100644 --- a/databases/tdbc-mysql/distinfo +++ b/databases/tdbc-mysql/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdbcmysql1.1.3.tar.gz) = /7GgjVJ10GwAQc5WMmPO/SvbHf4ya0FpWnnlLdHDsgk= -SIZE (tdbcmysql1.1.3.tar.gz) = 181429 +SHA256 (tdbcmysql1.1.5.tar.gz) = EyXe0+lVcAesGITW+d0Jk45dAoBLWFgFNPYEa/WjiCE= +SIZE (tdbcmysql1.1.5.tar.gz) = 183157 diff --git a/databases/tdbc-mysql/patches/patch-generic_tdbcmysql_c b/databases/tdbc-mysql/patches/patch-generic_tdbcmysql_c deleted file mode 100644 index 97fc2cd4b51..00000000000 --- a/databases/tdbc-mysql/patches/patch-generic_tdbcmysql_c +++ /dev/null @@ -1,44 +0,0 @@ -Index: generic/tdbcmysql.c ---- generic/tdbcmysql.c.orig -+++ generic/tdbcmysql.c -@@ -376,11 +376,16 @@ static const char *const TclIsolationLevels[] = { - "serializable", - NULL - }; -+ -+/* -+Bug report: https://core.tcl-lang.org/tdbcmysql/info/9bf0e3e2e7 -+Fixing commit: https://core.tcl-lang.org/tdbcmysql/info/e5b2587e70 -+*/ - static const char *const SqlIsolationLevels[] = { -- "SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED", -- "SET TRANSACTION ISOLATION LEVEL READ COMMITTED", -- "SET TRANSACTION ISOLATION LEVEL REPEATABLE READ", -- "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", -+ "SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED", -+ "SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED", -+ "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ", -+ "SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE", - NULL - }; - enum IsolationLevel { -@@ -3732,7 +3737,18 @@ Tdbcmysql_Init( - return TCL_ERROR; - } - mysql_library_init(0, NULL, NULL); -- mysqlClientVersion = mysql_get_client_version(); -+ -+ /* -+ The only use of mysqlClientVersion in this in this program is to check that -+ it is >= 50100 and select "st_mysql_bind_50" or "st_mysql_bind_51" accordingly. -+ Since MariaDb 10.6.2 the client version (a lower number) is reported. -+ https://github.com/perl5-dbi/DBD-mysql/issues/333 -+ (The current MariaDb version is over 10 at the time of this writing.) -+ Set the version manually to always select "st_mysql_bind_51". -+ */ -+ -+ mysqlClientVersion = 50100; -+ - } - ++mysqlRefCount; - Tcl_MutexUnlock(&mysqlMutex); diff --git a/databases/tdbc-mysql/patches/patch-tests_tdbcmysql_test b/databases/tdbc-mysql/patches/patch-tests_tdbcmysql_test deleted file mode 100644 index dc3758e6458..00000000000 --- a/databases/tdbc-mysql/patches/patch-tests_tdbcmysql_test +++ /dev/null @@ -1,12 +0,0 @@ -Index: tests/tdbcmysql.test ---- tests/tdbcmysql.test.orig -+++ tests/tdbcmysql.test -@@ -118,7 +118,7 @@ test tdbc::mysql-1.9 {create a connection, failure} {* - list $status $result $::errorCode - } - -match glob -- -result {1 {Unknown MySQL server host*} {TDBC GENERAL_ERROR HY000 MYSQL *}} -+ -result {1 {Unknown *server host*} {TDBC GENERAL_ERROR HY000 MYSQL *}} - } - - #------------------------------------------------------------------------------