Merge lp:~gl-az/percona-xtrabackup/bug1243009-2.1 into lp:percona-xtrabackup/2.1
- bug1243009-2.1
- Merge into 2.1
Status: | Superseded |
---|---|
Proposed branch: | lp:~gl-az/percona-xtrabackup/bug1243009-2.1 |
Merge into: | lp:percona-xtrabackup/2.1 |
Diff against target: |
417 lines (+88/-41) 16 files modified
test/inc/common.sh (+13/-3) test/run.sh (+20/-4) test/t/bug1037379.sh (+2/-2) test/t/bug1112224.sh (+1/-1) test/t/bug483827.sh (+4/-10) test/t/bug664986.sh (+4/-4) test/t/bug729843.sh (+1/-1) test/t/bug740489.sh (+1/-1) test/t/bug996493.sh (+1/-1) test/t/ib_doublewrite.sh (+3/-7) test/t/ib_empty_dir.sh (+1/-1) test/t/ib_slave_info.sh (+1/-1) test/t/kill_long_selects.sh (+2/-2) test/t/version_check.sh (+7/-1) utils/build-binary.sh (+14/-1) utils/build.sh (+13/-1) |
To merge this branch: | bzr merge lp:~gl-az/percona-xtrabackup/bug1243009-2.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Information | ||
Review via email: mp+192085@code.launchpad.net |
This proposal has been superseded by a proposal from 2013-11-15.
Commit message
Description of the change
Partial fix for bug1234009 --debug and --valgrind options needed for XtraBackup's build-binary.sh
Catch and pass --debug through to ./utils/build.sh
- 682. By Alexey Kopytov
-
Bug #1239670: xtrabackup_
slave_info does not contain GTID purge lists Modified innobackupex to detect when the slave server is in the GTID
mode, and produce the correct (pseudo-)SQL to setup a new slave in this
case. I.e. xtrabackup_slave_info instead of: CHANGE MASTER TO MASTER_
LOG_FILE= ..., MASTER_LOG_POS=... will contain:
SET GLOBAL gtid_purged=...;
CHANGE MASTER TO MASTER_AUTO_POSITION= 1 - 683. By Alexey Kopytov
- 684. By Alexey Kopytov
-
Merged lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1214274.
- 685. By Alexey Kopytov
-
Merged lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1239728.
- 686. By Alexey Kopytov
- 687. By Alexey Kopytov
- 688. By Alexey Kopytov
-
Merged lp:~akopytov/percona-xtrabackup/innodb_checksum_algorithm-2.1.
- 689. By Alexey Kopytov
- 690. By Alexey Kopytov
- 691. By Alexey Kopytov
-
Empty merge from 2.0.
- 692. By Alexey Kopytov
-
Merged lp:~akopytov/percona-xtrabackup/support-innodb-log-checksum-algorithm-2.1.
- 693. By George Ormond Lorch III
-
Fix for bug 1243009 --debug and --valgrind options needed for XtraBackup's build-binary.sh
util/build-
binary. sh:
Added new options --debug, --relwithdebinfo and --valgrind. These will set and export the DEBUG, RELWITHDEBINFO and VALGRIND variables to 'yes' before calling build.sh if specified. Even though they are mutually exclusive, there is no explicit test for this case.util/build.sh:
Added testing for RELWITHDEBINFO and VALGRIND variables and set up build/make options necessary for each case.test/run.sh and test/inc/common.sh:
Added -v N option to run.sh to allow enabling of valgrind when using test suite. N specifies a value that will be bassed to valgrinds --error-exitcode option. Made changes to accomplish this based on Alexey Kopytovs suggestions.
Moved innobackupex_no_defaults_ file into inc/common.sh from t/ib_doublewrite.sh since the concept is used in a few tests and correct fixup of IB_ARGS[@] is necessary in order to preserve args and valgrind options and makes a couple test cases a little simpler. Fixed up several test cases that use/depend on $IB_ARGS to use "${IB_ARGS[@]}".
Unmerged revisions
- 693. By George Ormond Lorch III
-
Fix for bug 1243009 --debug and --valgrind options needed for XtraBackup's build-binary.sh
util/build-
binary. sh:
Added new options --debug, --relwithdebinfo and --valgrind. These will set and export the DEBUG, RELWITHDEBINFO and VALGRIND variables to 'yes' before calling build.sh if specified. Even though they are mutually exclusive, there is no explicit test for this case.util/build.sh:
Added testing for RELWITHDEBINFO and VALGRIND variables and set up build/make options necessary for each case.test/run.sh and test/inc/common.sh:
Added -v N option to run.sh to allow enabling of valgrind when using test suite. N specifies a value that will be bassed to valgrinds --error-exitcode option. Made changes to accomplish this based on Alexey Kopytovs suggestions.
Moved innobackupex_no_defaults_ file into inc/common.sh from t/ib_doublewrite.sh since the concept is used in a few tests and correct fixup of IB_ARGS[@] is necessary in order to preserve args and valgrind options and makes a couple test cases a little simpler. Fixed up several test cases that use/depend on $IB_ARGS to use "${IB_ARGS[@]}".
Preview Diff
1 | === modified file 'test/inc/common.sh' | |||
2 | --- test/inc/common.sh 2013-11-07 12:23:43 +0000 | |||
3 | +++ test/inc/common.sh 2013-11-15 01:01:52 +0000 | |||
4 | @@ -2,9 +2,19 @@ | |||
5 | 2 | 2 | ||
6 | 3 | function innobackupex() | 3 | function innobackupex() |
7 | 4 | { | 4 | { |
9 | 5 | run_cmd $IB_BIN $IB_ARGS $* | 5 | run_cmd $IB_BIN "${IB_ARGS[@]}" $* |
10 | 6 | } | 6 | } |
11 | 7 | function innobackupex_no_defaults_file() | ||
12 | 8 | { | ||
13 | 9 | local IB_ARGS_NO_DEFAULTS_FILE=() | ||
14 | 10 | for arg in "${IB_ARGS[@]}"; do | ||
15 | 11 | if [[ $arg != "--defaults-file="* ]]; then | ||
16 | 12 | IB_ARGS_NO_DEFAULTS_FILE[${#IB_ARGS_NO_DEFAULTS_FILE[@]}]=$arg | ||
17 | 13 | fi | ||
18 | 14 | done | ||
19 | 7 | 15 | ||
20 | 16 | run_cmd $IB_BIN "${IB_ARGS_NO_DEFAULTS_FILE[@]}" $* | ||
21 | 17 | } | ||
22 | 8 | function xtrabackup() | 18 | function xtrabackup() |
23 | 9 | { | 19 | { |
24 | 10 | run_cmd $XB_BIN $XB_ARGS $* | 20 | run_cmd $XB_BIN $XB_ARGS $* |
25 | @@ -239,8 +249,8 @@ | |||
26 | 239 | MYSQLD_ARGS="$MYSQLD_ARGS --user=root" | 249 | MYSQLD_ARGS="$MYSQLD_ARGS --user=root" |
27 | 240 | fi | 250 | fi |
28 | 241 | 251 | ||
31 | 242 | IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN \ | 252 | IB_ARGS=("--defaults-file=$MYSQLD_VARDIR/my.cnf" "--ibbackup=$XB_BIN" |
32 | 243 | --no-version-check" | 253 | "--no-version-check") |
33 | 244 | XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf" | 254 | XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf" |
34 | 245 | 255 | ||
35 | 246 | # Some aliases for compatibility, as tests use the following names | 256 | # Some aliases for compatibility, as tests use the following names |
36 | 247 | 257 | ||
37 | === modified file 'test/run.sh' | |||
38 | --- test/run.sh 2013-09-23 05:21:56 +0000 | |||
39 | +++ test/run.sh 2013-11-15 01:01:52 +0000 | |||
40 | @@ -38,10 +38,11 @@ | |||
41 | 38 | function usage() | 38 | function usage() |
42 | 39 | { | 39 | { |
43 | 40 | cat <<EOF | 40 | cat <<EOF |
45 | 41 | Usage: $0 [-f] [-g] [-h] [-s suite] [-t test_name] [-d mysql_basedir] [-c build_conf] | 41 | Usage: $0 [-f] [-g] [-v child_error_exit] [-h] [-s suite] [-t test_name] [-d mysql_basedir] [-c build_conf] |
46 | 42 | -f Continue running tests after failures | 42 | -f Continue running tests after failures |
47 | 43 | -d path Server installation directory. Default is './server'. | 43 | -d path Server installation directory. Default is './server'. |
48 | 44 | -g Debug mode | 44 | -g Debug mode |
49 | 45 | -v N Run XtraBackup binary through "valgrind --error-exitcode=N". | ||
50 | 45 | -t path Run only a single named test | 46 | -t path Run only a single named test |
51 | 46 | -h Print this help message | 47 | -h Print this help message |
52 | 47 | -s suite Select a test suite to run. Possible values: experimental, t. | 48 | -s suite Select a test suite to run. Possible values: experimental, t. |
53 | @@ -440,7 +441,12 @@ | |||
54 | 440 | vlog "Cannot find '$XB_BIN' in PATH" | 441 | vlog "Cannot find '$XB_BIN' in PATH" |
55 | 441 | return 1 | 442 | return 1 |
56 | 442 | fi | 443 | fi |
58 | 443 | XB_BIN="$XB_PATH" | 444 | if [ -z "$VALGRIND" ] |
59 | 445 | then | ||
60 | 446 | XB_BIN="$XB_PATH" | ||
61 | 447 | else | ||
62 | 448 | XB_BIN="valgrind --error-exitcode=$VALGRIND $XB_PATH" | ||
63 | 449 | fi | ||
64 | 444 | 450 | ||
65 | 445 | # Set the correct binary for innobackupex | 451 | # Set the correct binary for innobackupex |
66 | 446 | IB_BIN="`which innobackupex`" | 452 | IB_BIN="`which innobackupex`" |
67 | @@ -771,8 +777,9 @@ | |||
68 | 771 | SUBUNIT_OUT=test_results.subunit | 777 | SUBUNIT_OUT=test_results.subunit |
69 | 772 | NWORKERS= | 778 | NWORKERS= |
70 | 773 | DEBUG_WORKER="" | 779 | DEBUG_WORKER="" |
71 | 780 | VALGRIND="" | ||
72 | 774 | 781 | ||
74 | 775 | while getopts "fgh?:t:s:d:c:j:T:" options; do | 782 | while getopts "fgh?:t:s:d:c:j:v:T:" options; do |
75 | 776 | case $options in | 783 | case $options in |
76 | 777 | f ) force="yes";; | 784 | f ) force="yes";; |
77 | 778 | t ) | 785 | t ) |
78 | @@ -786,6 +793,15 @@ | |||
79 | 786 | ;; | 793 | ;; |
80 | 787 | 794 | ||
81 | 788 | g ) DEBUG=on;; | 795 | g ) DEBUG=on;; |
82 | 796 | v ) | ||
83 | 797 | if [[ ! $OPTARG =~ ^[0-9]+$ ]] | ||
84 | 798 | then | ||
85 | 799 | echo "Wrong -v argument: $OPTARG" | ||
86 | 800 | exit -1 | ||
87 | 801 | fi | ||
88 | 802 | VALGRIND="$OPTARG" | ||
89 | 803 | ;; | ||
90 | 804 | |||
91 | 789 | h ) usage; exit;; | 805 | h ) usage; exit;; |
92 | 790 | s ) tname="$OPTARG/*.sh";; | 806 | s ) tname="$OPTARG/*.sh";; |
93 | 791 | d ) export MYSQL_BASEDIR="$OPTARG";; | 807 | d ) export MYSQL_BASEDIR="$OPTARG";; |
94 | @@ -844,7 +860,7 @@ | |||
95 | 844 | echo "Running against $MYSQL_FLAVOR $MYSQL_VERSION ($INNODB_FLAVOR $INNODB_VERSION)" | | 860 | echo "Running against $MYSQL_FLAVOR $MYSQL_VERSION ($INNODB_FLAVOR $INNODB_VERSION)" | |
96 | 845 | tee -a $OUTFILE | 861 | tee -a $OUTFILE |
97 | 846 | 862 | ||
99 | 847 | echo "Using '`basename $XB_BIN`' as xtrabackup binary" | tee -a $OUTFILE | 863 | echo "Using '$XB_BIN' as xtrabackup binary" | tee -a $OUTFILE |
100 | 848 | 864 | ||
101 | 849 | [ -z "$NWORKERS" ] && autocalc_nworkers | 865 | [ -z "$NWORKERS" ] && autocalc_nworkers |
102 | 850 | 866 | ||
103 | 851 | 867 | ||
104 | === modified file 'test/t/bug1037379.sh' | |||
105 | --- test/t/bug1037379.sh 2012-10-16 15:05:23 +0000 | |||
106 | +++ test/t/bug1037379.sh 2013-11-15 01:01:52 +0000 | |||
107 | @@ -40,7 +40,7 @@ | |||
108 | 40 | ################################################################################ | 40 | ################################################################################ |
109 | 41 | 41 | ||
110 | 42 | # The following will fail due to a timeout | 42 | # The following will fail due to a timeout |
112 | 43 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \ | 43 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --safe-slave-backup \ |
113 | 44 | --safe-slave-backup-timeout=3 $topdir/backup1 | 44 | --safe-slave-backup-timeout=3 $topdir/backup1 |
114 | 45 | 45 | ||
115 | 46 | grep -q "Slave_open_temp_tables did not become zero" $OUTFILE | 46 | grep -q "Slave_open_temp_tables did not become zero" $OUTFILE |
116 | @@ -57,7 +57,7 @@ | |||
117 | 57 | run_cmd $MYSQL $MYSQL_ARGS -e "STOP SLAVE SQL_THREAD" | 57 | run_cmd $MYSQL $MYSQL_ARGS -e "STOP SLAVE SQL_THREAD" |
118 | 58 | 58 | ||
119 | 59 | # The following will fail due to a timeout | 59 | # The following will fail due to a timeout |
121 | 60 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \ | 60 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --safe-slave-backup \ |
122 | 61 | --safe-slave-backup-timeout=3 $topdir/backup2 | 61 | --safe-slave-backup-timeout=3 $topdir/backup2 |
123 | 62 | 62 | ||
124 | 63 | grep -c "Slave_open_temp_tables did not become zero" $OUTFILE | grep -w 2 | 63 | grep -c "Slave_open_temp_tables did not become zero" $OUTFILE | grep -w 2 |
125 | 64 | 64 | ||
126 | === modified file 'test/t/bug1112224.sh' | |||
127 | --- test/t/bug1112224.sh 2013-03-18 14:13:04 +0000 | |||
128 | +++ test/t/bug1112224.sh 2013-11-15 01:01:52 +0000 | |||
129 | @@ -35,7 +35,7 @@ | |||
130 | 35 | vlog "Log applied to full backup" | 35 | vlog "Log applied to full backup" |
131 | 36 | 36 | ||
132 | 37 | # Command should fail and print error message | 37 | # Command should fail and print error message |
134 | 38 | run_cmd_expect_failure $IB_BIN $IB_ARGS --apply-log --redo-only --incremental-dir=$topdir/inc \ | 38 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --apply-log --redo-only --incremental-dir=$topdir/inc \ |
135 | 39 | $topdir/full | 39 | $topdir/full |
136 | 40 | if ! grep -q "Cannot handle DDL operation" $OUTFILE | 40 | if ! grep -q "Cannot handle DDL operation" $OUTFILE |
137 | 41 | then | 41 | then |
138 | 42 | 42 | ||
139 | === modified file 'test/t/bug483827.sh' | |||
140 | --- test/t/bug483827.sh 2013-04-27 18:46:54 +0000 | |||
141 | +++ test/t/bug483827.sh 2013-11-15 01:01:52 +0000 | |||
142 | @@ -2,12 +2,6 @@ | |||
143 | 2 | # Bug #483827: support for mysqld_multi | 2 | # Bug #483827: support for mysqld_multi |
144 | 3 | ######################################################################## | 3 | ######################################################################## |
145 | 4 | 4 | ||
146 | 5 | function modify_args() | ||
147 | 6 | { | ||
148 | 7 | XB_ARGS=`echo $XB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'` | ||
149 | 8 | IB_ARGS=`echo $IB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'` | ||
150 | 9 | } | ||
151 | 10 | |||
152 | 11 | . inc/common.sh | 5 | . inc/common.sh |
153 | 12 | 6 | ||
154 | 13 | start_server | 7 | start_server |
155 | @@ -15,14 +9,14 @@ | |||
156 | 15 | backup_dir=$topdir/backup | 9 | backup_dir=$topdir/backup |
157 | 16 | 10 | ||
158 | 17 | # change defaults file from my.cnf to my_multi.cnf | 11 | # change defaults file from my.cnf to my_multi.cnf |
160 | 18 | modify_args | 12 | XB_ARGS=`echo $XB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'` |
161 | 19 | 13 | ||
162 | 20 | # make my_multi.cnf | 14 | # make my_multi.cnf |
163 | 21 | sed -e 's/\[mysqld\]/[mysqld1]/' $topdir/my.cnf > $topdir/my_multi.cnf | 15 | sed -e 's/\[mysqld\]/[mysqld1]/' $topdir/my.cnf > $topdir/my_multi.cnf |
164 | 22 | 16 | ||
165 | 23 | # Backup | 17 | # Backup |
168 | 24 | innobackupex --no-timestamp --defaults-group=mysqld1 $backup_dir | 18 | innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --no-timestamp --defaults-group=mysqld1 $backup_dir |
169 | 25 | innobackupex --apply-log $backup_dir | 19 | innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --apply-log $backup_dir |
170 | 26 | 20 | ||
171 | 27 | stop_server | 21 | stop_server |
172 | 28 | 22 | ||
173 | @@ -30,7 +24,7 @@ | |||
174 | 30 | rm -rf ${mysql_datadir}/* | 24 | rm -rf ${mysql_datadir}/* |
175 | 31 | 25 | ||
176 | 32 | # restore backup | 26 | # restore backup |
178 | 33 | innobackupex --copy-back --defaults-group=mysqld1 $backup_dir | 27 | innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --copy-back --defaults-group=mysqld1 $backup_dir |
179 | 34 | 28 | ||
180 | 35 | # make sure that data are in correct place | 29 | # make sure that data are in correct place |
181 | 36 | if [ ! -f ${mysql_datadir}/ibdata1 ] ; then | 30 | if [ ! -f ${mysql_datadir}/ibdata1 ] ; then |
182 | 37 | 31 | ||
183 | === modified file 'test/t/bug664986.sh' | |||
184 | --- test/t/bug664986.sh 2013-07-03 18:30:28 +0000 | |||
185 | +++ test/t/bug664986.sh 2013-11-15 01:01:52 +0000 | |||
186 | @@ -18,23 +18,23 @@ | |||
187 | 18 | # Test that wrong directory permissions result in a backup failure | 18 | # Test that wrong directory permissions result in a backup failure |
188 | 19 | # for both InnoDB and non-InnoDB files | 19 | # for both InnoDB and non-InnoDB files |
189 | 20 | chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb | 20 | chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb |
191 | 21 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup | 21 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup |
192 | 22 | chmod 777 $MYSQLD_DATADIR/test_bug664986_innodb | 22 | chmod 777 $MYSQLD_DATADIR/test_bug664986_innodb |
193 | 23 | rm -rf $topdir/backup | 23 | rm -rf $topdir/backup |
194 | 24 | 24 | ||
195 | 25 | chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam | 25 | chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam |
197 | 26 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup | 26 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup |
198 | 27 | chmod 777 $MYSQLD_DATADIR/test_bug664986_myisam | 27 | chmod 777 $MYSQLD_DATADIR/test_bug664986_myisam |
199 | 28 | rm -rf $topdir/backup | 28 | rm -rf $topdir/backup |
200 | 29 | 29 | ||
201 | 30 | # Test that wrong file permissions result in a backup failure | 30 | # Test that wrong file permissions result in a backup failure |
202 | 31 | # for both InnoDB and non-InnoDB files | 31 | # for both InnoDB and non-InnoDB files |
203 | 32 | chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd | 32 | chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd |
205 | 33 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup | 33 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup |
206 | 34 | chmod 644 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd | 34 | chmod 644 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd |
207 | 35 | rm -rf $topdir/backup | 35 | rm -rf $topdir/backup |
208 | 36 | 36 | ||
209 | 37 | chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD | 37 | chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD |
211 | 38 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup | 38 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup |
212 | 39 | chmod 644 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD | 39 | chmod 644 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD |
213 | 40 | rm -rf $topdir/backup | 40 | rm -rf $topdir/backup |
214 | 41 | 41 | ||
215 | === modified file 'test/t/bug729843.sh' | |||
216 | --- test/t/bug729843.sh 2013-02-05 11:54:27 +0000 | |||
217 | +++ test/t/bug729843.sh 2013-11-15 01:01:52 +0000 | |||
218 | @@ -12,7 +12,7 @@ | |||
219 | 12 | # Don't use run_cmd_* or innobackupex functions here to avoid logging | 12 | # Don't use run_cmd_* or innobackupex functions here to avoid logging |
220 | 13 | # the full command line (including the password in plaintext) | 13 | # the full command line (including the password in plaintext) |
221 | 14 | set +e | 14 | set +e |
223 | 15 | $IB_BIN $IB_ARGS --password=secretpassword $topdir/backup 2>&1 | tee $logfile | 15 | $IB_BIN "${IB_ARGS[@]}" --password=secretpassword $topdir/backup 2>&1 | tee $logfile |
224 | 16 | set -e | 16 | set -e |
225 | 17 | 17 | ||
226 | 18 | # Check that the password was not logged in plaintext | 18 | # Check that the password was not logged in plaintext |
227 | 19 | 19 | ||
228 | === modified file 'test/t/bug740489.sh' | |||
229 | --- test/t/bug740489.sh 2013-04-27 18:46:54 +0000 | |||
230 | +++ test/t/bug740489.sh 2013-11-15 01:01:52 +0000 | |||
231 | @@ -24,7 +24,7 @@ | |||
232 | 24 | backup_dir=$topdir/backup | 24 | backup_dir=$topdir/backup |
233 | 25 | run_cmd $IB_BIN \ | 25 | run_cmd $IB_BIN \ |
234 | 26 | --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \ | 26 | --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \ |
236 | 27 | --ibbackup=$XB_BIN --no-timestamp $backup_dir | 27 | "--ibbackup=$XB_BIN" --no-timestamp $backup_dir |
237 | 28 | vlog "Backup created in directory $backup_dir" | 28 | vlog "Backup created in directory $backup_dir" |
238 | 29 | 29 | ||
239 | 30 | run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF | 30 | run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF |
240 | 31 | 31 | ||
241 | === modified file 'test/t/bug996493.sh' | |||
242 | --- test/t/bug996493.sh 2013-07-03 18:30:28 +0000 | |||
243 | +++ test/t/bug996493.sh 2013-11-15 01:01:52 +0000 | |||
244 | @@ -24,7 +24,7 @@ | |||
245 | 24 | # Do not run innobackupex, because it pass option --defaults-file | 24 | # Do not run innobackupex, because it pass option --defaults-file |
246 | 25 | # which we should avoid. Our goal is to test that backup-my.cnf | 25 | # which we should avoid. Our goal is to test that backup-my.cnf |
247 | 26 | # will be read by default when apply-log is run. | 26 | # will be read by default when apply-log is run. |
249 | 27 | run_cmd $IB_BIN --ibbackup=$XB_BIN --apply-log $backup_dir | 27 | run_cmd $IB_BIN "--ibbackup=$XB_BIN" --apply-log $backup_dir |
250 | 28 | 28 | ||
251 | 29 | vlog "Get my.cnf back" | 29 | vlog "Get my.cnf back" |
252 | 30 | mv $topdir/my.cnf.bak $topdir/my.cnf | 30 | mv $topdir/my.cnf.bak $topdir/my.cnf |
253 | 31 | 31 | ||
254 | === modified file 'test/t/ib_doublewrite.sh' | |||
255 | --- test/t/ib_doublewrite.sh 2013-07-25 15:04:49 +0000 | |||
256 | +++ test/t/ib_doublewrite.sh 2013-11-15 01:01:52 +0000 | |||
257 | @@ -23,13 +23,6 @@ | |||
258 | 23 | start_server | 23 | start_server |
259 | 24 | load_dbase_schema incremental_sample | 24 | load_dbase_schema incremental_sample |
260 | 25 | 25 | ||
261 | 26 | # Workaround for bug #1072695 | ||
262 | 27 | IB_ARGS_NO_DEFAULTS_FILE=`echo $IB_ARGS | sed -e 's/--defaults-file=[^ ]* / /'` | ||
263 | 28 | function innobackupex_no_defaults_file () | ||
264 | 29 | { | ||
265 | 30 | run_cmd $IB_BIN $IB_ARGS_NO_DEFAULTS_FILE $* | ||
266 | 31 | } | ||
267 | 32 | |||
268 | 33 | # Adding initial rows | 26 | # Adding initial rows |
269 | 34 | vlog "Adding initial rows to database..." | 27 | vlog "Adding initial rows to database..." |
270 | 35 | ${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample | 28 | ${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample |
271 | @@ -75,17 +68,20 @@ | |||
272 | 75 | vlog "##############" | 68 | vlog "##############" |
273 | 76 | vlog "# PREPARE #1 #" | 69 | vlog "# PREPARE #1 #" |
274 | 77 | vlog "##############" | 70 | vlog "##############" |
275 | 71 | # Workaround for bug #1072695 | ||
276 | 78 | innobackupex_no_defaults_file --apply-log --redo-only $full_backup_dir | 72 | innobackupex_no_defaults_file --apply-log --redo-only $full_backup_dir |
277 | 79 | vlog "Log applied to full backup" | 73 | vlog "Log applied to full backup" |
278 | 80 | vlog "##############" | 74 | vlog "##############" |
279 | 81 | vlog "# PREPARE #2 #" | 75 | vlog "# PREPARE #2 #" |
280 | 82 | vlog "##############" | 76 | vlog "##############" |
281 | 77 | # Workaround for bug #1072695 | ||
282 | 83 | innobackupex_no_defaults_file --apply-log --redo-only --incremental-dir=$inc_backup_dir \ | 78 | innobackupex_no_defaults_file --apply-log --redo-only --incremental-dir=$inc_backup_dir \ |
283 | 84 | $full_backup_dir | 79 | $full_backup_dir |
284 | 85 | vlog "Delta applied to full backup" | 80 | vlog "Delta applied to full backup" |
285 | 86 | vlog "##############" | 81 | vlog "##############" |
286 | 87 | vlog "# PREPARE #3 #" | 82 | vlog "# PREPARE #3 #" |
287 | 88 | vlog "##############" | 83 | vlog "##############" |
288 | 84 | # Workaround for bug #1072695 | ||
289 | 89 | innobackupex_no_defaults_file --apply-log $full_backup_dir | 85 | innobackupex_no_defaults_file --apply-log $full_backup_dir |
290 | 90 | vlog "Data prepared for restore" | 86 | vlog "Data prepared for restore" |
291 | 91 | 87 | ||
292 | 92 | 88 | ||
293 | === modified file 'test/t/ib_empty_dir.sh' | |||
294 | --- test/t/ib_empty_dir.sh 2012-10-15 16:14:59 +0000 | |||
295 | +++ test/t/ib_empty_dir.sh 2013-11-15 01:01:52 +0000 | |||
296 | @@ -22,7 +22,7 @@ | |||
297 | 22 | vlog "###########" | 22 | vlog "###########" |
298 | 23 | vlog "# RESTORE #" | 23 | vlog "# RESTORE #" |
299 | 24 | vlog "###########" | 24 | vlog "###########" |
301 | 25 | run_cmd_expect_failure $IB_BIN $IB_ARGS --copy-back $backup_dir | 25 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --copy-back $backup_dir |
302 | 26 | 26 | ||
303 | 27 | if grep -q "is not empty!" $OUTFILE | 27 | if grep -q "is not empty!" $OUTFILE |
304 | 28 | then | 28 | then |
305 | 29 | 29 | ||
306 | === modified file 'test/t/ib_slave_info.sh' | |||
307 | --- test/t/ib_slave_info.sh 2013-08-18 18:07:09 +0000 | |||
308 | +++ test/t/ib_slave_info.sh 2013-11-15 01:01:52 +0000 | |||
309 | @@ -18,7 +18,7 @@ | |||
310 | 18 | switch_server $slave_id | 18 | switch_server $slave_id |
311 | 19 | 19 | ||
312 | 20 | vlog "Check that --slave-info with --no-lock and no --safe-slave-backup fails" | 20 | vlog "Check that --slave-info with --no-lock and no --safe-slave-backup fails" |
314 | 21 | run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --slave-info --no-lock \ | 21 | run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --slave-info --no-lock \ |
315 | 22 | $topdir/backup | 22 | $topdir/backup |
316 | 23 | 23 | ||
317 | 24 | innobackupex --no-timestamp --slave-info $topdir/backup | 24 | innobackupex --no-timestamp --slave-info $topdir/backup |
318 | 25 | 25 | ||
319 | === modified file 'test/t/kill_long_selects.sh' | |||
320 | --- test/t/kill_long_selects.sh 2013-10-21 10:32:46 +0000 | |||
321 | +++ test/t/kill_long_selects.sh 2013-11-15 01:01:52 +0000 | |||
322 | @@ -141,7 +141,7 @@ | |||
323 | 141 | 141 | ||
324 | 142 | sleep 1 | 142 | sleep 1 |
325 | 143 | 143 | ||
327 | 144 | run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \ | 144 | run_cmd_expect_failure ${IB_BIN} "${IB_ARGS[@]}" $topdir/full \ |
328 | 145 | --lock-wait-timeout=3 \ | 145 | --lock-wait-timeout=3 \ |
329 | 146 | --lock-wait-query-type=all \ | 146 | --lock-wait-query-type=all \ |
330 | 147 | --lock-wait-threshold=1 \ | 147 | --lock-wait-threshold=1 \ |
331 | @@ -160,7 +160,7 @@ | |||
332 | 160 | 160 | ||
333 | 161 | sleep 2 | 161 | sleep 2 |
334 | 162 | 162 | ||
336 | 163 | run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \ | 163 | run_cmd_expect_failure ${IB_BIN} "${IB_ARGS[@]}" $topdir/full \ |
337 | 164 | --lock-wait-timeout=3 \ | 164 | --lock-wait-timeout=3 \ |
338 | 165 | --lock-wait-query-type=update \ | 165 | --lock-wait-query-type=update \ |
339 | 166 | --lock-wait-threshold=2 \ | 166 | --lock-wait-threshold=2 \ |
340 | 167 | 167 | ||
341 | === modified file 'test/t/version_check.sh' | |||
342 | --- test/t/version_check.sh 2013-11-07 12:23:43 +0000 | |||
343 | +++ test/t/version_check.sh 2013-11-15 01:01:52 +0000 | |||
344 | @@ -35,7 +35,13 @@ | |||
345 | 35 | die "/tmp/percona-version-check has been created with --no-version-check!" | 35 | die "/tmp/percona-version-check has been created with --no-version-check!" |
346 | 36 | fi | 36 | fi |
347 | 37 | 37 | ||
349 | 38 | IB_ARGS=`echo $IB_ARGS | sed -e 's/--no-version-check//g'` | 38 | for ((i=0; i < ${#IB_ARGS[@]}; i++)) |
350 | 39 | do | ||
351 | 40 | if [ "${IB_ARGS[$i]}" = "--no-version-check" ] | ||
352 | 41 | then | ||
353 | 42 | IB_ARGS=("${IB_ARGS[@]:0:$i}" "${IB_ARGS[@]:(($i + 1))}") | ||
354 | 43 | fi | ||
355 | 44 | done | ||
356 | 39 | 45 | ||
357 | 40 | innobackupex --no-timestamp $topdir/backup2 | 46 | innobackupex --no-timestamp $topdir/backup2 |
358 | 41 | 47 | ||
359 | 42 | 48 | ||
360 | === modified file 'utils/build-binary.sh' | |||
361 | --- utils/build-binary.sh 2013-06-05 08:39:54 +0000 | |||
362 | +++ utils/build-binary.sh 2013-11-15 01:01:52 +0000 | |||
363 | @@ -22,7 +22,8 @@ | |||
364 | 22 | # Check if we have a functional getopt(1) | 22 | # Check if we have a functional getopt(1) |
365 | 23 | if ! getopt --test | 23 | if ! getopt --test |
366 | 24 | then | 24 | then |
368 | 25 | go_out="$(getopt --options="i" --longoptions=i686 \ | 25 | go_out="$(getopt --options="drvi" \ |
369 | 26 | --longoptions="debug, relwithdebinfo, valgrind, i686" \ | ||
370 | 26 | --name="$(basename "$0")" -- "$@")" | 27 | --name="$(basename "$0")" -- "$@")" |
371 | 27 | test $? -eq 0 || exit 1 | 28 | test $? -eq 0 || exit 1 |
372 | 28 | eval set -- $go_out | 29 | eval set -- $go_out |
373 | @@ -32,6 +33,18 @@ | |||
374 | 32 | do | 33 | do |
375 | 33 | case "$arg" in | 34 | case "$arg" in |
376 | 34 | -- ) shift; break;; | 35 | -- ) shift; break;; |
377 | 36 | -d | --debug ) | ||
378 | 37 | shift | ||
379 | 38 | export DEBUG=yes | ||
380 | 39 | ;; | ||
381 | 40 | -r | --relwithdebinfo ) | ||
382 | 41 | shift | ||
383 | 42 | export RELWITHDEBINFO=yes | ||
384 | 43 | ;; | ||
385 | 44 | -v | --valgrind ) | ||
386 | 45 | shift | ||
387 | 46 | export VALGRIND=yes | ||
388 | 47 | ;; | ||
389 | 35 | -i | --i686 ) | 48 | -i | --i686 ) |
390 | 36 | shift | 49 | shift |
391 | 37 | TARGET="i686" | 50 | TARGET="i686" |
392 | 38 | 51 | ||
393 | === modified file 'utils/build.sh' | |||
394 | --- utils/build.sh 2013-07-20 14:24:26 +0000 | |||
395 | +++ utils/build.sh 2013-11-15 01:01:52 +0000 | |||
396 | @@ -35,8 +35,20 @@ | |||
397 | 35 | ;; | 35 | ;; |
398 | 36 | esac | 36 | esac |
399 | 37 | 37 | ||
400 | 38 | if [ -n "$VALGRIND" ] | ||
401 | 39 | then | ||
402 | 40 | export CFLAGS="$CFLAGS -g -O0" | ||
403 | 41 | export CXXFLAGS="$CXXFLAGS -g -O0" | ||
404 | 42 | extra_config_51= | ||
405 | 43 | extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_VALGRIND=ON" | ||
406 | 44 | elif [ -n "$RELWITHDEBINFO" ] | ||
407 | 45 | then | ||
408 | 46 | export CFLAGS="$CFLAGS -g -O0" | ||
409 | 47 | export CXXFLAGS="$CXXFLAGS -g -O0" | ||
410 | 48 | extra_config_51= | ||
411 | 49 | extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo" | ||
412 | 38 | # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now | 50 | # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now |
414 | 39 | if [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ] | 51 | elif [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ] |
415 | 40 | then | 52 | then |
416 | 41 | # InnoDB extra debug flags | 53 | # InnoDB extra debug flags |
417 | 42 | innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \ | 54 | innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \ |
Same question as in 2.0 MP.