Merge branch '10.0' into 10.0-galera

Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0

Conflicts:
	.bzrignore
	storage/xtradb/CMakeLists.txt

2 files changed, 5 insertions, 2 deletions

diff --git a/support-files/build-tags b/support-files/build-tags
index 44bd2a02593..4b76e01907a 100755
--- a/support-files/build-tags
+++ b/support-files/build-tags
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.ic$\|errmsg-utf8\.txt$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$\|errmsg-utf8\.txt$'
 
 list="find . -type f"
-bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
+git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
 $list |grep $filter | xargs etags -o TAGS --append
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 122a28aa576..104ad436843 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