Merge lp:~gl-az/percona-xtrabackup/bug1243009-2.1 into lp:percona-xtrabackup/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.
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
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[@]}".
Same question as in 2.0 MP.