mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 0f0cebe87fab335873fd3701bc304922da826940 Mon Sep 17 00:00:00 2001
|
|
From: Michiel Beijen <michiel.beijen@gmail.com>
|
|
Date: Fri, 23 Feb 2018 07:52:33 +0000
|
|
Subject: [PATCH] Use net_buffer_length macro if available
|
|
|
|
---
|
|
mysql.xs | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/mysql.xs b/mysql.xs
|
|
index 3a9373d..0f97645 100644
|
|
--- a/mysql.xs
|
|
+++ b/mysql.xs
|
|
@@ -840,15 +840,14 @@ dbd_mysql_get_info(dbh, sql_info_type)
|
|
retsv = newSVpvn("`", 1);
|
|
break;
|
|
case SQL_MAXIMUM_STATEMENT_LENGTH:
|
|
-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
|
|
- /* MariaDB 10 is not MySQL source level compatible so this
|
|
- only applies to MySQL*/
|
|
- /* mysql_get_option() was added in mysql 5.7.3 */
|
|
- /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */
|
|
+ /* net_buffer_length macro is not defined in MySQL 5.7 and some MariaDB
|
|
+ versions - if it is not available, use newer mysql_get_option */
|
|
+#if !defined(net_buffer_length)
|
|
+ ;
|
|
+ unsigned long buffer_len;
|
|
mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len);
|
|
retsv = newSViv(buffer_len);
|
|
#else
|
|
- /* before mysql 5.7.9 use net_buffer_length macro */
|
|
retsv = newSViv(net_buffer_length);
|
|
#endif
|
|
break;
|
|
|