Merge lp:~tsarev/percona-server/5.5.13-merge into lp:percona-server/5.5

[Oleg Tsarev]

fix revision 122 (incorrect merge)

=== modified file 'install_tests.sh'
--- install_tests.sh	2011-02-03 13:49:01 +0000
+++ install_tests.sh	2011-06-20 09:38:14 +0000
@@ -1,20 +1,35 @@
 #!/bin/sh
 
-test -z ${PERCONA_SERVER} && export PERCONA_SERVER=Percona-Server
-echo PERCONA_SERVER=${PERCONA_SERVER}
-
+set -u
+
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
+    | cut -d = -f 2)"
+export PERCONA_SERVER="Percona-Server"
+
+install_file_type()
+{
+    for file in `ls $1/*.$2 2>/dev/null`; do
+	test -f $file && install -m 644 $file ${PERCONA_SERVER}/mysql-test/$3
+    done;
+}
+do_install_path()
+{
+    install_file_type $1 test t
+    install_file_type $1 opt t
+    install_file_type $1 result r
+    install_file_type $1 require r
+    install_file_type $1 inc include
+}
 install_path()
 {
-    echo "Installing mysql-test files: $2"
-    find $1 -iname '*.test' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
-    find $1 -iname '*.opt' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
-    find $1 -iname '*.result' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
-    find $1 -iname '*.require' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
-    find $1 -iname '*.inc' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/include/ ';'
+    echo "[$3/$4] Installing mysql-test files: $2"
+    test -d $1 && do_install_path $1 $2
 }
-
-install_path mysql-test "global"
+current=0;
+count=`wc -l series`;
+install_path mysql-test "global" $current $count
 for test_name in `cat series`; do
-    test -d mysql-test/$test_name && install_path mysql-test/$test_name $test_name
+    current=$((current+1));
+    install_path mysql-test/$test_name $test_name $current $count
 done
 echo "Done"
 
=== removed file 'install_tests.sh.THIS'
--- install_tests.sh.THIS	2011-06-20 08:13:54 +0000
+++ install_tests.sh.THIS	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -u
-
-#MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
-#    | cut -d = -f 2)"
-export PERCONA_SERVER="Percona-Server"
-
-install_file_type()
-{
-    for file in `ls $1/*.$2 2>/dev/null`; do
-	test -f $file && install -m 644 $file ${PERCONA_SERVER}/mysql-test/$3
-    done;
-}
-do_install_path()
-{
-    install_file_type $1 test t
-    install_file_type $1 opt t
-    install_file_type $1 result r
-    install_file_type $1 require r
-    install_file_type $1 inc include
-}
-install_path()
-{
-    echo "[$3/$4] Installing mysql-test files: $2"
-    test -d $1 && do_install_path $1 $2
-}
-current=0;
-count=`wc -l series`;
-install_path mysql-test "global" $current $count
-for test_name in `cat series`; do
-    current=$((current+1));
-    install_path mysql-test/$test_name $test_name $current $count
-done
-echo "Done"