summaryrefslogtreecommitdiffstats
path: root/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-27 19:19:28 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-28 09:00:01 +0200
commitabdca401c7c45e652987c030a41f12408b916eee (patch)
tree76c2fc1ecf31b7ffda50faffe5d22d6f437316a2 /source/ap/mariadb/mariadb.ConnectorName.cmake.diff
parente8ee1c899f7806500603c155005637b4186b32a2 (diff)
downloadcurrent-abdca401c7c45e652987c030a41f12408b916eee.tar.gz
current-abdca401c7c45e652987c030a41f12408b916eee.tar.xz
Tue Apr 27 19:19:28 UTC 202120210427191928
a/mkinitrd-1.4.11-x86_64-24.txz: Rebuilt. Change mkinitrd shebang to #!/bin/bash. Thanks to mumahendras3. Still, don't point /bin/sh at a shell other than bash. Only include dm-snapshot if LVM is included. Thanks to j12i. a/tcsh-6.22.04-x86_64-1.txz: Upgraded. ap/mariadb-10.6.0-x86_64-1.txz: Upgraded. Removed TokuDB stuff from rc.mysqld. Thanks to gsl. This update fixes the illegal instruction regession on 32-bit with processors that do not support SSE4.1 instructions. Thanks to Noel and Charlie Wilder for reporting the issue upstream and Matteo Bernardini for helping with the debugging. And of course, thanks to the MariaDB upstream developers. :-)
Diffstat (limited to 'source/ap/mariadb/mariadb.ConnectorName.cmake.diff')
-rw-r--r--source/ap/mariadb/mariadb.ConnectorName.cmake.diff12
1 files changed, 0 insertions, 12 deletions
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
deleted file mode 100644
index 75da7d99..00000000
--- a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
---- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake 2021-02-16 08:50:36.000000000 -0600
-+++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake 2021-04-03 12:41:14.858993480 -0500
-@@ -22,7 +22,7 @@
- SET(MACHINE_NAME "x64")
- ELSE()
- SET(MACHINE_NAME "32")
-- END()
-+ ENDIF()
- ENDIF()
-
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")