diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/MacOSX/ReadMe.txt | 4 | ||||
| -rw-r--r-- | support-files/binary-configure.sh | 2 | ||||
| -rw-r--r-- | support-files/mariadb.service.in | 10 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 16 | ||||
| -rw-r--r-- | support-files/mysql-log-rotate.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql-multi.server.sh | 16 | ||||
| -rw-r--r-- | support-files/mysql.server-sys5.sh | 10 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 76 | ||||
| -rw-r--r-- | support-files/policy/apparmor/usr.sbin.mysqld | 6 |
9 files changed, 71 insertions, 71 deletions
diff --git a/support-files/MacOSX/ReadMe.txt b/support-files/MacOSX/ReadMe.txt index 8b833049ad4..31fb0d97e14 100644 --- a/support-files/MacOSX/ReadMe.txt +++ b/support-files/MacOSX/ReadMe.txt @@ -73,7 +73,7 @@ Note /usr/local/mysql-5.1.39-osx10.5-x86_64 . The installation layout of the directory is as shown in the following table: Directory Contents of Directory - bin Client programs and the mysqld server + bin Client programs and the mariadbd server data Log files, databases docs Manual in Info format include Include (header) files @@ -285,7 +285,7 @@ Note Directory Contents of Directory /usr/bin Client programs /var/mysql Log files, databases - /usr/libexec The mysqld server + /usr/libexec The mariadbd server /usr/share/man Unix manual pages /usr/share/mysql/mysql-test MySQL test suite /usr/share/mysql Contains the mysql_install_db script diff --git a/support-files/binary-configure.sh b/support-files/binary-configure.sh index 5e6d62f69a0..47123668683 100644 --- a/support-files/binary-configure.sh +++ b/support-files/binary-configure.sh @@ -41,7 +41,7 @@ echo "" ./scripts/mysql_install_db --no-defaults if [ $? = 0 ] then - echo "Starting the mysqld server. You can test that it is up and running" + echo "Starting the mariadbd server. You can test that it is up and running" echo "with the command:" echo "./bin/mysqladmin version" ./bin/mysqld_safe --no-defaults & diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index 6db3545e86d..07b07b40868 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -20,7 +20,7 @@ [Unit] Description=MariaDB @VERSION@ database server -Documentation=man:mysqld(8) +Documentation=man:mariadbd(8) Documentation=https://mariadb.com/kb/en/library/systemd/ After=network.target @@ -37,7 +37,7 @@ WantedBy=multi-user.target Type=notify # Setting this to true can break replication and the Type=notify settings -# See also bind-address mysqld option. +# See also bind-address mariadbd option. PrivateNetwork=false ############################################################################## @@ -89,7 +89,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \ # Use the [Service] section and Environment="MYSQLD_OPTS=...". # This isn't a replacement for my.cnf. # _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster -ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION +ExecStart=@sbindir@/mariadbd $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION # Unset _WSREP_START_POSITION environment variable. ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" @@ -118,7 +118,7 @@ UMask=007 # Useful options not previously available in [mysqld_safe] -# Kernels like killing mysqld when out of memory because its big. +# Kernels like killing mariadbd when out of memory because its big. # Lets temper that preference a little. # OOMScoreAdjust=-600 @@ -163,7 +163,7 @@ LimitNOFILE=16364 # ExecStartPre=sysctl -q -w vm.drop_caches=3 # numa-interleave=1 equalivant -# Change ExecStart=numactl --interleave=all @sbindir@/mysqld...... +# Change ExecStart=numactl --interleave=all @sbindir@/mariadbd...... # crash-script equalivent # FailureAction= diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index f12f44311f5..371b7047eac 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -34,10 +34,10 @@ # like network ports, sockets and data directories listed under CONFLICTING # VARIABLES below. The systemd environment variable MYSQLD_MULTI_INSTANCE # controls each instance to ensure it is run independently. It is passed to -# mysqld and mysql_install +# mariadbd and mysql_install # # By default, a group suffix exists and within the default configuration -# files, a group [mysqld.{instancename}] is read for each service. Other +# files, a group [mariadbd.{instancename}] is read for each service. Other # default groups, like [server.{instancename}] and [mariadb.{instancename}], # are also read. For each instance, one of the groups will need to contain # the conflicting variables listed below under CONFLICTING VARIABLES. @@ -119,7 +119,7 @@ # Before 10.4 MYSQLD_MULTI_INSTANCE was effectively --defaults-file=@sysconf2dir@/my%I.cnf # As @sysconfdir@/my.cnf included these files it was a bad choice as an # existing single instance would include all these files. If you want to -# continue a file based multi-instance mysqld, recommend the Configuration File +# continue a file based multi-instance mariadbd, recommend the Configuration File # Based Mechanism above and moving @sysconf2dir@/my%I.cnf files to @sysconfdir@/my%I.cnf. # # @@ -145,7 +145,7 @@ [Unit] Description=MariaDB @VERSION@ database server (multi-instance %I) -Documentation=man:mysqld(8) +Documentation=man:mariadbd(8) Documentation=https://mariadb.com/kb/en/library/systemd/ After=network.target @@ -170,7 +170,7 @@ WantedBy=multi-user.target Type=notify # Setting this to true can break replication and the Type=notify settings -# See also bind-address mysqld option. +# See also bind-address mariadbd option. PrivateNetwork=false ############################################################################## @@ -206,7 +206,7 @@ ExecStartPre=@scriptdir@/mysql_install_db $MYSQLD_MULTI_INSTANCE # * MYSQLD_OPTS - user definable extras - not a replacement for my.cnf # # Note 1: Place $MYSQLD_OPTS at the very end for its options to take precedence. -ExecStart=@sbindir@/mysqld $MYSQLD_MULTI_INSTANCE $MYSQLD_OPTS +ExecStart=@sbindir@/mariadbd $MYSQLD_MULTI_INSTANCE $MYSQLD_OPTS @SYSTEMD_EXECSTARTPOST@ @@ -232,7 +232,7 @@ UMask=007 # Useful options not previously available in [mysqld_safe] -# Kernels like killing mysqld when out of memory because its big. +# Kernels like killing mariadbd when out of memory because its big. # Lets temper that preference a little. # OOMScoreAdjust=-600 @@ -288,7 +288,7 @@ LimitNOFILE=16364 # ExecStartPre=sysctl -q -w vm.drop_caches=3 # numa-interleave=1 equalivant -# Change ExecStart=numactl --interleave=all @sbindir@/mysqld...... +# Change ExecStart=numactl --interleave=all @sbindir@/mariadbd...... # crash-script equalivent # FailureAction= diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh index 293229d8482..37ae018c1d1 100644 --- a/support-files/mysql-log-rotate.sh +++ b/support-files/mysql-log-rotate.sh @@ -26,7 +26,7 @@ missingok compress postrotate - # just if mysqld is really running + # just if mariadbd is really running if test -x @bindir@/mysqladmin && \ @bindir@/mysqladmin ping &>/dev/null then diff --git a/support-files/mysql-multi.server.sh b/support-files/mysql-multi.server.sh index f90d662fa8c..a7a51e6a095 100644 --- a/support-files/mysql-multi.server.sh +++ b/support-files/mysql-multi.server.sh @@ -50,7 +50,7 @@ then exit 1 fi -echo "mysqld $svr $mode" +echo "mariadbd $svr $mode" parse_arguments() { for arg do @@ -107,7 +107,7 @@ fi datadir=@localstatedir@ basedir= pid_file= -parse_arguments `$print_defaults $defaults mysqld mysql_server mysql_multi_server` +parse_arguments `$print_defaults $defaults mariadbd mysqld mysql_server mysql_multi_server` if test -z "$basedir" then @@ -157,15 +157,15 @@ case "$mode" in # root password. if test -f "$pid_file" then - mysqld_pid=`cat $pid_file` - echo "Killing mysqld $svr with pid $mysqld_pid" - kill $mysqld_pid - # mysqld should remove the pid_file when it exits, so wait for it. + mariadbd_pid=`cat $pid_file` + echo "Killing mariadbd $svr with pid $mariadbd_pid" + kill $mariadbd_pid + # mariadbd should remove the pid_file when it exits, so wait for it. sleep 1 while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ] do - [ -z "$flags" ] && echo "Wait for mysqld $svr to exit\c" || echo ".\c" + [ -z "$flags" ] && echo "Wait for mariadbd $svr to exit\c" || echo ".\c" flags=a$flags sleep 1 done @@ -180,7 +180,7 @@ case "$mode" in rm /var/lock/subsys/mysql fi else - echo "No mysqld pid file found. Looked for $pid_file." + echo "No mariadbd pid file found. Looked for $pid_file." fi ;; diff --git a/support-files/mysql.server-sys5.sh b/support-files/mysql.server-sys5.sh index 4bda51acc4d..3049b43d267 100644 --- a/support-files/mysql.server-sys5.sh +++ b/support-files/mysql.server-sys5.sh @@ -30,7 +30,7 @@ EOF do_start() { - nohup ./bin/mysqld --defaults-file="$MY_CFG" & + nohup ./bin/mariadbd --defaults-file="$MY_CFG" & } do_stop() { @@ -45,7 +45,7 @@ do_kill_all() { } do_kill() { - MY_PIDFILE=`read_mysql_config "$MY_CFG" "mysqld" "pidfile" ` + MY_PIDFILE=`read_mysql_config "$MY_CFG" "mariadbd" "pidfile" ` read MY_PID < "$MY_PIDFILE" kill "$MY_PID" sleep 2 @@ -60,14 +60,14 @@ do_admin() { } do_repair() { - MY_DATADIR=`read_mysql_config "$MY_CFG" "mysqld" "datadir" ` + MY_DATADIR=`read_mysql_config "$MY_CFG" "mariadbd" "datadir" ` ./bin/isamchk --defaults-file="$MY_CFG" --repair "$MY_DATADIR/$1" shift } do_repair_all() { - MY_DATADIR=`read_mysql_config "$MY_CFG" "mysqld" "datadir" ` + MY_DATADIR=`read_mysql_config "$MY_CFG" "mariadbd" "datadir" ` for i in `find "$MY_DATADIR" -name "*.ISM"` do ./bin/isamchk --defaults-file="$MY_CFG" --repair "$MY_DATADIR/$i" @@ -76,7 +76,7 @@ do_repair_all() { -MY_BASEDIR=`read_mysql_config "$MY_CFG" "mysqld" "basedir"` +MY_BASEDIR=`read_mysql_config "$MY_CFG" "mariadbd" "basedir"` cd "$MY_BASEDIR" || exit 1 while test $# -gt 0 do diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 6eb2d0bc257..cefb3225e9e 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -59,7 +59,7 @@ lock_file_path="$lockdir/mysql" # The following variables are only set for letting mysql.server find things. # Set some defaults -mysqld_pid_file_path= +mariadbd_pid_file_path= if test -z "$basedir" then basedir=@prefix@ @@ -77,7 +77,7 @@ else datadir="$basedir/data" fi sbindir="$basedir/sbin" - if test -f "$basedir/bin/mysqld" + if test -f "$basedir/bin/mariadbd" then libexecdir="$basedir/bin" else @@ -134,7 +134,7 @@ parse_server_arguments() { datadir="$basedir/data" fi sbindir="$basedir/sbin" - if test -f "$basedir/bin/mysqld" + if test -f "$basedir/bin/mariadbd" then libexecdir="$basedir/bin" else @@ -146,9 +146,9 @@ parse_server_arguments() { datadir_set=1 ;; --log-basename=*|--hostname=*|--loose-log-basename=*) - mysqld_pid_file_path="$val.pid" + mariadbd_pid_file_path="$val.pid" ;; - --pid-file=*) mysqld_pid_file_path="$val" ;; + --pid-file=*) mariadbd_pid_file_path="$val" ;; --service-startup-timeout=*) service_startup_timeout="$val" ;; --user=*) user="$val"; ;; esac @@ -280,13 +280,13 @@ wait_for_ready () { # # Set pid file if not given # -if test -z "$mysqld_pid_file_path" +if test -z "$mariadbd_pid_file_path" then - mysqld_pid_file_path=$datadir/`@HOSTNAME@`.pid + mariadbd_pid_file_path=$datadir/`@HOSTNAME@`.pid else - case "$mysqld_pid_file_path" in + case "$mariadbd_pid_file_path" in /* ) ;; - * ) mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;; + * ) mariadbd_pid_file_path="$datadir/$mariadbd_pid_file_path" ;; esac fi @@ -307,7 +307,7 @@ case "$mode" in then # Give extra arguments to mysqld with the my.cnf file. This script # may be overwritten at next upgrade. - $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mariadbd_pid_file_path" "$@" & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE @@ -326,18 +326,18 @@ case "$mode" in # Stop daemon. We use a signal here to avoid having to know the # root password. - if test -s "$mysqld_pid_file_path" + if test -s "$mariadbd_pid_file_path" then - mysqld_pid=`cat "$mysqld_pid_file_path"` + mariadbd_pid=`cat "$mariadbd_pid_file_path"` - if su_kill -0 $mysqld_pid ; then + if su_kill -0 $mariadbd_pid ; then echo $echo_n "Shutting down MariaDB" - su_kill $mysqld_pid + su_kill $mariadbd_pid # mysqld should remove the pid file when it exits, so wait for it. - wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$? + wait_for_gone $mariadbd_pid "$mariadbd_pid_file_path"; return_value=$? else - log_failure_msg "MariaDB server process #$mysqld_pid is not running!" - rm "$mysqld_pid_file_path" + log_failure_msg "MariaDB server process #$mariadbd_pid is not running!" + rm "$mariadbd_pid_file_path" fi # Delete lock for RedHat / SuSE @@ -366,10 +366,10 @@ case "$mode" in ;; 'reload'|'force-reload') - if test -s "$mysqld_pid_file_path" ; then - read mysqld_pid < "$mysqld_pid_file_path" - su_kill -HUP $mysqld_pid && log_success_msg "Reloading service MariaDB" - touch "$mysqld_pid_file_path" + if test -s "$mariadbd_pid_file_path" ; then + read mariadbd_pid < "$mariadbd_pid_file_path" + su_kill -HUP $mariadbd_pid && log_success_msg "Reloading service MariaDB" + touch "$mariadbd_pid_file_path" else log_failure_msg "MariaDB PID file could not be found!" exit 1 @@ -377,25 +377,25 @@ case "$mode" in ;; 'status') # First, check to see if pid file exists - if test -s "$mysqld_pid_file_path" ; then - read mysqld_pid < "$mysqld_pid_file_path" - if su_kill -0 $mysqld_pid ; then - log_success_msg "MariaDB running ($mysqld_pid)" + if test -s "$mariadbd_pid_file_path" ; then + read mariadbd_pid < "$mariadbd_pid_file_path" + if su_kill -0 $mariadbd_pid ; then + log_success_msg "MariaDB running ($mariadbd_pid)" exit 0 else log_failure_msg "MariaDB is not running, but PID file exists" exit 1 fi else - # Try to find appropriate mysqld process - mysqld_pid=`pgrep -f $libexecdir/mysqld` + # Try to find appropriate mariadbd process + mariadbd_pid=`pgrep -f $libexecdir/mariadbd` # test if multiple pids exist - pid_count=`echo $mysqld_pid | wc -w` + pid_count=`echo $mariadbd_pid | wc -w` if test $pid_count -gt 1 ; then - log_failure_msg "Multiple MariaDB running but PID file could not be found ($mysqld_pid)" + log_failure_msg "Multiple MariaDB running but PID file could not be found ($mariadbd_pid)" exit 5 - elif test -z $mysqld_pid ; then + elif test -z $mariadbd_pid ; then if test -f "$lock_file_path" ; then log_failure_msg "MariaDB is not running, but lock file ($lock_file_path) exists" exit 2 @@ -412,18 +412,18 @@ case "$mode" in # Safeguard (relative paths, core dumps..) cd $basedir echo $echo_n "Testing MariaDB configuration syntax" - daemon=$bindir/mysqld - if test -x $libexecdir/mysqld + daemon=$bindir/mariadbd + if test -x $libexecdir/mariadbd then - daemon=$libexecdir/mysqld - elif test -x $sbindir/mysqld + daemon=$libexecdir/mariadbd + elif test -x $sbindir/mariadbd then - daemon=$sbindir/mysqld - elif test -x `which mysqld` + daemon=$sbindir/mariadbd + elif test -x `which mariadbd` then - daemon=`which mysqld` + daemon=`which mariadbd` else - log_failure_msg "Unable to locate the mysqld binary!" + log_failure_msg "Unable to locate the mariadbd binary!" exit 1 fi help_out=`$daemon --help 2>&1`; r=$? diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld index 6555c614889..18a9c357ff2 100644 --- a/support-files/policy/apparmor/usr.sbin.mysqld +++ b/support-files/policy/apparmor/usr.sbin.mysqld @@ -5,7 +5,7 @@ #include <tunables/global> -/usr/sbin/mysqld flags=(complain) { +/usr/sbin/mariadbd flags=(complain) { #include <abstractions/base> #include <abstractions/mysql> #include <abstractions/nameservice> @@ -46,7 +46,7 @@ /tmp/** rw, /usr/lib/mysql/plugin/ r, /usr/lib/mysql/plugin/*.so* mr, - /usr/sbin/mysqld mr, + /usr/sbin/mariadbd mr, /usr/share/mysql/** r, /var/lib/mysql/ r, /var/lib/mysql/** rwk, @@ -147,5 +147,5 @@ /usr/bin/xbstream rix, } # Site-specific additions and overrides. See local/README for details. - #include <local/usr.sbin.mysqld> + #include <local/usr.sbin.mariadbd> } |