Merge 10.2 into 10.3

scripts/convert-debug-for-diff.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -i
+#!/usr/bin/env perl -i
 #
 # This script converts all numbers that look like addresses or memory sizes,
 # in a debug files generated by --debug (like mysqld --debug-dbug), to #.

scripts/mytop.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 #
 # $Id: mytop,v 1.91 2012/01/18 16:49:12 mgrennan Exp $
 

scripts/wsrep_sst_rsync.sh

@@ -199,6 +199,7 @@ fi
 
 # New filter - exclude everything except dirs (schemas) and innodb files
 FILTER="-f '- /lost+found'
+        -f '- /.zfs'
         -f '- /.fseventsd'
         -f '- /.Trashes'
         -f '+ /wsrep_sst_binlog.tar'
@@ -355,7 +356,7 @@ EOF
         [ "$OS" = "Linux" ] && count=$(grep -c processor /proc/cpuinfo)
         [ "$OS" = "Darwin" -o "$OS" = "FreeBSD" ] && count=$(sysctl -n hw.ncpu)
 
-        find . -maxdepth 1 -mindepth 1 -type d -not -name "lost+found" \
+        find . -maxdepth 1 -mindepth 1 -type d -not -name "lost+found" -not -name ".zfs" \
              -print0 | xargs -I{} -0 -P $count \
              rsync ${STUNNEL:+--rsh="$STUNNEL"} \
              --owner --group --perms --links --specials \
@@ -438,6 +439,7 @@ timeout = 300
 $SILENT
 [$MODULE]
     path = $WSREP_SST_OPT_DATA
+    exclude = .zfs
 [$MODULE-log_dir]
     path = $WSREP_LOG_DIR
 [$MODULE-data_dir]