Merge branch '10.1' into 10.2

9 files changed, 36 insertions, 55 deletions

diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index c80de04d069..c9addecafa5 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -90,6 +90,8 @@ IF(UNIX)
   SET(scriptdir ${INSTALL_SCRIPTDIRABS})
   SET(libexecdir ${INSTALL_SBINDIRABS})
   SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS})
+  SET(sysconfdir ${INSTALL_SYSCONFDIR})
+  SET(sysconf2dir ${INSTALL_SYSCONF2DIR})
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh 
                  ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY)
   INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
diff --git a/support-files/MacOSX/ReadMe.txt b/support-files/MacOSX/ReadMe.txt
index d81ec1f66d6..8b833049ad4 100644
--- a/support-files/MacOSX/ReadMe.txt
+++ b/support-files/MacOSX/ReadMe.txt
@@ -110,7 +110,7 @@ Note
        Continue .
 
     5. If you have downloaded the community version of MySQL, you
-       will be shown a copy of the relevent GNU General Public
+       will be shown a copy of the relevant GNU General Public
        License. Click Continue .
 
     6. Select the drive you want to use to install the MySQL Startup
@@ -128,7 +128,7 @@ Note
        will be given an Install Succeeded message.
 
    Once you have completed the basic installation, you must complete
-   the post-installation steps as specifed in Section 2.13,
+   the post-installation steps as specified in Section 2.13,
    "Post-Installation Setup and Testing."
 
    For convenience, you may also want to install the Section 2.7.2,
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 6b82d83a8fe..249060108bf 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -153,7 +153,7 @@
 # OpenSSL
 #
 # The following comes because of different prototype between yassl and openssl.
-# Save as the argument is a function withing the library.
+# Save as the argument is a function within the library.
 .*/vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type
 
 #
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 15f41c6377f..6a307b2c41f 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -67,19 +67,19 @@ PermissionsStartOnly=true
 # It is always safe to unset _WSREP_START_POSITION environment variable.
 # Do not panic if galera_recovery script is not available. (MDEV-10538)
 ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
-ExecStartPre=/bin/sh -c "[ ! -e /usr/bin/galera_recovery ] && VAR= || \
- VAR=`/usr/bin/galera_recovery`; [ $? -eq 0 ] \
+ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
+ VAR=`@bindir@/galera_recovery`; [ $? -eq 0 ] \
  && systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
 
 # Needed to create system tables etc.
-# ExecStartPre=/usr/bin/mysql_install_db -u mysql
+# ExecStartPre=@scriptdir@/mysql_install_db -u mysql
 
 # Start main service
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf
 # 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=/usr/sbin/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
+ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
 @SYSTEMD_EXECSTARTPOST@
 
 # Unset _WSREP_START_POSITION environment variable.
@@ -136,7 +136,7 @@ LimitNOFILE=16364
 # Timezone. previously [mysqld_safe] timezone
 # Environment="TZ=UTC"
 
-# Library substitutions. previously [mysqld_safe] malloc-lib with explict paths
+# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
 # (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
 # Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
 
@@ -145,7 +145,7 @@ LimitNOFILE=16364
 # ExecStartPre=sysctl -q -w vm.drop_caches=3
 
 # numa-interleave=1 equalivant
-# Change ExecStart=numactl --interleave=all /usr/sbin/mysqld......
+# Change ExecStart=numactl --interleave=all @sbindir@/mysqld......
 
 # crash-script equalivent
 # FailureAction=
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index e941f21526e..410e7433b2b 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -1,7 +1,7 @@
-# Multi instance version of mariadb. For if you run mutiple verions at once.
+# Multi instance version of mariadb. For if you run multiple versions at once.
 # Also used for mariadb@bootstrap to bootstrap Galera.
 #
-# create config file @INSTALL_SYSCONF2DIR@/my{instancename}.cnf
+# create config file @sysconf2dir@/my{instancename}.cnf
 #
 # start as systemctl start mariadb@{instancename}.server
 
@@ -22,7 +22,7 @@ Description=MariaDB database server
 After=network.target
 After=syslog.target
 
-ConditionPathExists=@INSTALL_SYSCONF2DIR@/my%I.cnf
+ConditionPathExists=@sysconf2dir@/my%I.cnf
 
 [Install]
 WantedBy=multi-user.target
@@ -73,19 +73,19 @@ PermissionsStartOnly=true
 # Do not panic if galera_recovery script is not available. (MDEV-10538)
 ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION%I"
 
-ExecStartPre=/bin/sh -c "[ ! -e /usr/bin/galera_recovery ] && VAR= || \
- VAR=`/usr/bin/galera_recovery --defaults-file=@INSTALL_SYSCONF2DIR@/my%I.cnf`; [ $? -eq 0 ] \
+ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
+ VAR=`@bindir@/galera_recovery --defaults-file=@sysconf2dir@/my%I.cnf`; [ $? -eq 0 ] \
  && systemctl set-environment _WSREP_START_POSITION%I=$VAR || exit 1"
 
 # Alternate: (remove ConditionPathExists above)
 # use [mysqld.INSTANCENAME] as sections in my.cnf
 #
-#ExecStartPre=/bin/sh -c "[ ! -e /usr/bin/galera_recovery ] && VAR= || \
-# VAR=`/usr/bin/galera_recovery --defaults-group-suffix=%I`; [ $? -eq 0 ] \
+#ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
+# VAR=`@bindir@/galera_recovery --defaults-group-suffix=%I`; [ $? -eq 0 ] \
 # && systemctl set-environment _WSREP_START_POSITION%I=$VAR || exit 1"
 
 # Needed to create system tables etc.
-# ExecStartPre=/usr/bin/mysql_install_db -u mysql
+# ExecStartPre=@scriptdir@/mysql_install_db -u mysql
 
 # Start main service
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb@.service.d/MY_SPECIAL.conf
@@ -95,12 +95,12 @@ ExecStartPre=/bin/sh -c "[ ! -e /usr/bin/galera_recovery ] && VAR= || \
 
 # Note: Place $MYSQLD_OPTS at the very end for its options to take precedence.
 
-ExecStart=/usr/sbin/mysqld --defaults-file=@INSTALL_SYSCONF2DIR@/my%I.cnf \
+ExecStart=@sbindir@/mysqld --defaults-file=@sysconf2dir@/my%I.cnf \
   $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION%I $MYSQLD_OPTS
 # Alternate: (remove ConditionPathExists above)
 # use [mysqld.INSTANCENAME] as sections in my.cnf
 #
-# ExecStart=/usr/sbin/mysqld --defaults-group-suffix=%I \
+# ExecStart=@sbindir@/mysqld --defaults-group-suffix=%I \
 # $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION%I $MYSQLD_OPTS
 
 # Unset _WSREP_START_POSITION environment variable.
@@ -157,7 +157,7 @@ LimitNOFILE=16364
 # Timezone. previously [mysqld_safe] timezone
 # Environment="TZ=UTC"
 
-# Library substitutions. previously [mysqld_safe] malloc-lib with explict paths
+# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
 # (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
 # Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
 
@@ -166,7 +166,7 @@ LimitNOFILE=16364
 # ExecStartPre=sysctl -q -w vm.drop_caches=3
 
 # numa-interleave=1 equalivant
-# Change ExecStart=numactl --interleave=all /usr/sbin/mysqld......
+# Change ExecStart=numactl --interleave=all @sbindir@/mysqld......
 
 # crash-script equalivent
 # FailureAction=
diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
index d934b23cf0d..2590ff5ddea 100644
--- a/support-files/my-innodb-heavy-4G.cnf.sh
+++ b/support-files/my-innodb-heavy-4G.cnf.sh
@@ -306,7 +306,7 @@ server-id = 1
 
 # Make the slave read-only. Only users with the SUPER privilege and the
 # replication slave thread will be able to modify data on it. You can
-# use this to ensure that no applications will accidently modify data on
+# use this to ensure that no applications will accidentally modify data on
 # the slave instead of the master
 #read_only
 
@@ -439,7 +439,7 @@ innodb_log_files_in_group = 3
 #innodb_log_group_home_dir
 
 # Maximum allowed percentage of dirty pages in the InnoDB buffer pool.
-# If it is reached, InnoDB will start flushing them out agressively to
+# If it is reached, InnoDB will start flushing them out aggressively to
 # not run out of clean pages at all. This is a soft limit, not
 # guaranteed to be held.
 innodb_max_dirty_pages_pct = 90
diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh
index 0ee78b0f7ca..5d1b30b208e 100644
--- a/support-files/mysql-log-rotate.sh
+++ b/support-files/mysql-log-rotate.sh
@@ -30,7 +30,8 @@
 	if test -x @bindir@/mysqladmin && \
 	   @bindir@/mysqladmin ping &>/dev/null
 	then
-	   @bindir@/mysqladmin flush-logs
+	   @bindir@/mysqladmin --local flush-error-log \
+              flush-engine-log flush-general-log flush-slow-log
 	fi
     endscript
 }
diff --git a/support-files/mysql-multi.server.sh b/support-files/mysql-multi.server.sh
index a036374a4b2..f90d662fa8c 100644
--- a/support-files/mysql-multi.server.sh
+++ b/support-files/mysql-multi.server.sh
@@ -12,7 +12,7 @@
 # started and shut down when the systems goes down. The '.svr1' suffix can
 # be used to identify one of a number of servers. Multiple symlinks can be
 # created, one per instance. The 'svrN' suffix can then be used to
-# prefix configuration variables in a seperate section of /etc/my.cnf.
+# prefix configuration variables in a separate section of /etc/my.cnf.
 # See example below.
 #
 # A typical multi-instance /etc/my.cnf file would look like:
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
index 9ef9bec3e0d..08b046dc272 100644
--- a/support-files/rpm/server-postin.sh
+++ b/support-files/rpm/server-postin.sh
@@ -45,6 +45,11 @@ if [ $1 = 1 ] ; then
   # The user may already exist, make sure it has the proper group nevertheless (BUG#12823)
   usermod --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true
 
+  # Temporary Workaround for MDEV-11386 - will be corrected in Advance Toolchain 10.0-3 and 8.0-8
+  for ldconfig in /opt/at*/sbin/ldconfig; do
+     test -x $ldconfig && $ldconfig
+  done
+
   # Change permissions so that the user that will run the MySQL daemon
   # owns all database files.
   chown -R %{mysqld_user}:%{mysqld_group} $datadir
@@ -69,36 +74,9 @@ fi
 SETARGETDIR=/etc/selinux/targeted/src/policy
 SEDOMPROG=$SETARGETDIR/domains/program
 SECONPROG=$SETARGETDIR/file_contexts/program
-if [ -f /etc/redhat-release ] ; then 
-   if grep '\(Red Hat Enterprise Linux ..\|CentOS\) release 4' \
-     /etc/redhat-release >/dev/null 2>&1; then
-     echo
-     echo
-     echo 'Notes regarding SELinux on this platform:'
-     echo '========================================='
-     echo
-     echo 'The default policy might cause server startup to fail because it is '
-     echo 'not allowed to access critical files. In this case, please update '
-     echo 'your installation. '
-     echo
-     echo 'The default policy might also cause inavailability of SSL related '
-     echo 'features because the server is not allowed to access /dev/random '
-     echo 'and /dev/urandom. If this is a problem, please do the following: '
-     echo 
-     echo '  1) install selinux-policy-targeted-sources from your OS vendor'
-     echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
-     echo '       allow mysqld_t random_device_t:chr_file read;'
-     echo '       allow mysqld_t urandom_device_t:chr_file read;'
-     echo '  3) cd to '$SETARGETDIR' and issue the following command:'
-     echo '       make load'
-     echo
-     echo
-   fi
-   if grep 'CentOS release 6' /etc/redhat-release >/dev/null 2>&1; then
-     if [ -x /usr/sbin/semodule ] ; then
-       /usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb.pp
-     fi
-   fi
+
+if [ -x /usr/sbin/semodule ] ; then
+  /usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb.pp
 fi
 
 if [ -x sbin/restorecon ] ; then