diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2021-04-23 19:13:09 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2021-04-24 08:59:55 +0200 |
| commit | 6e50489feda778db0ff21b6f06adb801e8a5d003 (patch) | |
| tree | e5747d4987977f0c4cea786e4f09c35d58c847a2 /source/ap | |
| parent | 675ce365d7efe35f956695690cd263288b5cc9f1 (diff) | |
| download | current-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.gz current-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.xz | |
Fri Apr 23 19:13:09 UTC 202120210423191309
a/pkgtools-15.0-noarch-39.txz: Rebuilt.
upgradepkg: revert change where $ROOT/sbin/installpkg is called instead of
/sbin/installpkg. Conceptually, this seemed like a nice change (but would
have also required removepkg to be called the same way), but it seems to
break an established expectation that the pkgtools can be used without them
actually being installed in $ROOT. Thanks to alienBOB.
a/sysvinit-scripts-15.0-noarch-2.txz: Rebuilt.
Use #!/bin/bash for these scripts so that bashisms don't cause script issues
if /bin/sh is some other shell. Thanks to mumahendras3.
rc.S: Use GazL's proposals for detecting/mounting /proc and /sys.
d/parallel-20210422-noarch-1.txz: Upgraded.
l/glib-networking-2.68.1-x86_64-1.txz: Upgraded.
l/gtk+3-3.24.29-x86_64-1.txz: Upgraded.
x/igt-gpu-tools-1.26-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
Rebuild with pkgtools-15.0-noarch-39.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Rebuild with pkgtools-15.0-noarch-39.
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/mariadb/rc.mysqld | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/ap/mariadb/rc.mysqld b/source/ap/mariadb/rc.mysqld index 8f63c29e7..1844fe27a 100644 --- a/source/ap/mariadb/rc.mysqld +++ b/source/ap/mariadb/rc.mysqld @@ -31,9 +31,6 @@ # uncommented to improve system security. SKIP="--skip-networking" -# Uncomment the next line to use TokuDB -#TOKUDB="--plugin-load=ha_tokudb" - # Start mysqld: mysqld_start() { if [ -x /usr/bin/mysqld_safe ]; then @@ -45,12 +42,7 @@ mysqld_start() { fi fi - if ! [ -z "$TOKUDB" ]; then - echo "never" > /sys/kernel/mm/transparent_hugepage/enabled - echo "never" > /sys/kernel/mm/transparent_hugepage/defrag - fi - - /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP $TOKUDB & + /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP & fi } @@ -71,10 +63,6 @@ mysqld_stop() { echo "WARNING: Gave up waiting for mysqld to exit!" sleep 15 fi - if ! [ -z "$TOKUDB" ]; then - echo "always" > /sys/kernel/mm/transparent_hugepage/enabled - echo "always" > /sys/kernel/mm/transparent_hugepage/defrag - fi fi } |