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

Proposed by Oleg Tsarev on 2011-06-20
Status: Merged
Approved by: Stewart Smith on 2011-06-20
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~tsarev/percona-server/5.5.13-merge
Merge into: lp:percona-server/5.5
Diff against target: 91 lines (+27/-47)
2 files modified
install_tests.sh (+27/-12)
install_tests.sh.THIS (+0/-35)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.5.13-merge
Reviewer Review Type Date Requested Status
Stewart Smith 2011-06-20 Pending
Review via email: mp+65172@code.launchpad.net

Description of the change

fix revision 122 (incorrect merge)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install_tests.sh'
2--- install_tests.sh 2011-02-03 13:49:01 +0000
3+++ install_tests.sh 2011-06-20 09:38:14 +0000
4@@ -1,20 +1,35 @@
5 #!/bin/sh
6
7-test -z ${PERCONA_SERVER} && export PERCONA_SERVER=Percona-Server
8-echo PERCONA_SERVER=${PERCONA_SERVER}
9-
10+set -u
11+
12+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
13+ | cut -d = -f 2)"
14+export PERCONA_SERVER="Percona-Server"
15+
16+install_file_type()
17+{
18+ for file in `ls $1/*.$2 2>/dev/null`; do
19+ test -f $file && install -m 644 $file ${PERCONA_SERVER}/mysql-test/$3
20+ done;
21+}
22+do_install_path()
23+{
24+ install_file_type $1 test t
25+ install_file_type $1 opt t
26+ install_file_type $1 result r
27+ install_file_type $1 require r
28+ install_file_type $1 inc include
29+}
30 install_path()
31 {
32- echo "Installing mysql-test files: $2"
33- find $1 -iname '*.test' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
34- find $1 -iname '*.opt' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/t/ ';'
35- find $1 -iname '*.result' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
36- find $1 -iname '*.require' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/r/ ';'
37- find $1 -iname '*.inc' -exec install -m 644 {} ${PERCONA_SERVER}/mysql-test/include/ ';'
38+ echo "[$3/$4] Installing mysql-test files: $2"
39+ test -d $1 && do_install_path $1 $2
40 }
41-
42-install_path mysql-test "global"
43+current=0;
44+count=`wc -l series`;
45+install_path mysql-test "global" $current $count
46 for test_name in `cat series`; do
47- test -d mysql-test/$test_name && install_path mysql-test/$test_name $test_name
48+ current=$((current+1));
49+ install_path mysql-test/$test_name $test_name $current $count
50 done
51 echo "Done"
52
53=== removed file 'install_tests.sh.THIS'
54--- install_tests.sh.THIS 2011-06-20 08:13:54 +0000
55+++ install_tests.sh.THIS 1970-01-01 00:00:00 +0000
56@@ -1,35 +0,0 @@
57-#!/bin/sh
58-
59-set -u
60-
61-#MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
62-# | cut -d = -f 2)"
63-export PERCONA_SERVER="Percona-Server"
64-
65-install_file_type()
66-{
67- for file in `ls $1/*.$2 2>/dev/null`; do
68- test -f $file && install -m 644 $file ${PERCONA_SERVER}/mysql-test/$3
69- done;
70-}
71-do_install_path()
72-{
73- install_file_type $1 test t
74- install_file_type $1 opt t
75- install_file_type $1 result r
76- install_file_type $1 require r
77- install_file_type $1 inc include
78-}
79-install_path()
80-{
81- echo "[$3/$4] Installing mysql-test files: $2"
82- test -d $1 && do_install_path $1 $2
83-}
84-current=0;
85-count=`wc -l series`;
86-install_path mysql-test "global" $current $count
87-for test_name in `cat series`; do
88- current=$((current+1));
89- install_path mysql-test/$test_name $test_name $current $count
90-done
91-echo "Done"

Subscribers

People subscribed via source and target branches