Merge branch '5.5' into 5.5-galera

Merge banch 5.5 till revision :
fdd6c11 - MDEV-7419 Function cli_safe_read not exported

Conflicts:
	.bzrignore
	debian/dist/Debian/mariadb-galera-server-5.5.files.in
	debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
	storage/tokudb/CMakeLists.txt
	support-files/build-tags

4 files changed, 42 insertions, 32 deletions

diff --git a/support-files/build-tags b/support-files/build-tags
index f42fae218d2..c37485e32f9 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -1,17 +1,12 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cc$\|\.c$\|\.h$\|\.yy\|\.ic\|.ih$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$'
 
-#list="find . -type f"
-bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
+list="find . -type f"
+git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
 $list |grep $filter |while read f; 
 do
 	 etags -o TAGS --append $f
 done
-
-(cd storage/galera && svn ls -R) | grep $filter | while read f; 
-do
-	etags -o TAGS --append storage/galera/$f
-done 
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 1600cb0f86a..30d1ecd5f4c 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -147,6 +147,9 @@ parse_server_arguments() {
       --datadir=*)  datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
 		    datadir_set=1
 	;;
+      --log-basename=*|--hostname=*|--loose-log-basename=*)
+        mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'`
+	;;
       --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
     esac
diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh
index 91885f73466..cd2aec4d84a 100644
--- a/support-files/rpm/server-postin.sh
+++ b/support-files/rpm/server-postin.sh
@@ -1,6 +1,10 @@
 
 # Make MySQL start/shutdown automatically when the machine does it.
 if [ $1 = 1 ] ; then
+  if [ -x /usr/bin/systemctl ] ; then
+          /usr/bin/systemctl daemon-reload >/dev/null 2>&1
+  fi
+
   if [ -x /sbin/chkconfig ] ; then
           /sbin/chkconfig --add mysql
   fi
@@ -51,30 +55,31 @@ fi
 SETARGETDIR=/etc/selinux/targeted/src/policy
 SEDOMPROG=$SETARGETDIR/domains/program
 SECONPROG=$SETARGETDIR/file_contexts/program
-if [ -f /etc/redhat-release ] \
-   && grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \
-   || grep -q "CentOS release 4" /etc/redhat-release ; 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
+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
 fi
 
 if [ -x sbin/restorecon ] ; then
diff --git a/support-files/rpm/server-postun.sh b/support-files/rpm/server-postun.sh
index dcf67173a02..412c6f4c67b 100644
--- a/support-files/rpm/server-postun.sh
+++ b/support-files/rpm/server-postun.sh
@@ -6,3 +6,10 @@ if [ $1 -ge 1 ]; then
     fi
   fi
 fi
+
+if [ $1 = 0 ] ; then
+  if [ -x /usr/bin/systemctl ] ; then
+    /usr/bin/systemctl daemon-reload > /dev/null 2>&1
+  fi
+fi
+