Merge lp:~gl-az/percona-xtrabackup/bug1243009-2.1 into lp:percona-xtrabackup/2.1

Proposed by George Ormond Lorch III on 2013-11-15
Status: Work in progress
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
Reviewer Review Type Date Requested Status
Vlad Lesin (community) g2 Needs Fixing on 2014-01-06
Alexey Kopytov 2013-11-15 Pending
Review via email: mp+195435@code.launchpad.net

This proposal supersedes a proposal from 2013-10-22.

Description of the change

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 passed 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[@]}".

jenkins http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/492/
jenkins with '-v 0 -T 1600' options http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/496/

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Same question as in 2.0 MP.

review: Needs Information
Vlad Lesin (vlad-lesin) wrote :

The same questions as here: https://code.launchpad.net/~gl-az/percona-xtrabackup/bug1243009-2.0/+merge/195434/comments/465887.

I am not sure in correctness if this code in test/t/version_check.sh:

+for ((i=0; i < ${#IB_ARGS[@]}; i++))
+do
+ if [ "${IB_ARGS[$i]}" = "--no-version-check" ]
+ then
+ IB_ARGS=("${IB_ARGS[@]:0:$i}" "${IB_ARGS[@]:(($i + 1))}")
+ fi
+done

Imagine you have three "--no-version-check" options in a line starting with index say 2. There will be the following iterations:

1)
before removing
index 2 3 4
i = 2, IB_ARGS = (... "--no-version-check" "--no-version-check" "--no-version-check" ...), ${#IB_ARGS[@]} = n
after removing
index 2 3
i = 2, IB_ARGS = (... "--no-version-check" "--no-version-check" ...), ${#IB_ARGS[@]} = n - 1

2)
before removing
index 2 3
i = 3, IB_ARGS = (... "--no-version-check" "--no-version-check" ...), ${#IB_ARGS[@]} = n - 1
after removing
index 2 3
i = 3, IB_ARGS = (... "--no-version-check" ... ...), ${#IB_ARGS[@]} = n - 2

So as we can see this algorithm removes only a half of "--no-version-check" elements because $i is increased on every loop but the tail of the array is shifted by one element left and the index of the next element after removed element is decreased.

review: Needs Fixing (g2)

Unmerged revisions

693. By George Ormond Lorch III on 2013-11-15

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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh 2013-11-07 12:23:43 +0000
+++ test/inc/common.sh 2013-11-15 18:16:05 +0000
@@ -2,9 +2,19 @@
22
3function innobackupex()3function innobackupex()
4{4{
5 run_cmd $IB_BIN $IB_ARGS $*5 run_cmd $IB_BIN "${IB_ARGS[@]}" $*
6}6}
7function innobackupex_no_defaults_file()
8{
9 local IB_ARGS_NO_DEFAULTS_FILE=()
10 for arg in "${IB_ARGS[@]}"; do
11 if [[ $arg != "--defaults-file="* ]]; then
12 IB_ARGS_NO_DEFAULTS_FILE[${#IB_ARGS_NO_DEFAULTS_FILE[@]}]=$arg
13 fi
14 done
715
16 run_cmd $IB_BIN "${IB_ARGS_NO_DEFAULTS_FILE[@]}" $*
17}
8function xtrabackup()18function xtrabackup()
9{19{
10 run_cmd $XB_BIN $XB_ARGS $*20 run_cmd $XB_BIN $XB_ARGS $*
@@ -239,8 +249,8 @@
239 MYSQLD_ARGS="$MYSQLD_ARGS --user=root"249 MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
240 fi250 fi
241251
242 IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN \252 IB_ARGS=("--defaults-file=$MYSQLD_VARDIR/my.cnf" "--ibbackup=$XB_BIN"
243--no-version-check"253 "--no-version-check")
244 XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"254 XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"
245255
246 # Some aliases for compatibility, as tests use the following names256 # Some aliases for compatibility, as tests use the following names
247257
=== modified file 'test/run.sh'
--- test/run.sh 2013-09-23 05:21:56 +0000
+++ test/run.sh 2013-11-15 18:16:05 +0000
@@ -38,10 +38,11 @@
38function usage()38function usage()
39{39{
40cat <<EOF40cat <<EOF
41Usage: $0 [-f] [-g] [-h] [-s suite] [-t test_name] [-d mysql_basedir] [-c build_conf]41Usage: $0 [-f] [-g] [-v child_error_exit] [-h] [-s suite] [-t test_name] [-d mysql_basedir] [-c build_conf]
42-f Continue running tests after failures42-f Continue running tests after failures
43-d path Server installation directory. Default is './server'.43-d path Server installation directory. Default is './server'.
44-g Debug mode44-g Debug mode
45-v N Run XtraBackup binary through "valgrind --error-exitcode=N".
45-t path Run only a single named test46-t path Run only a single named test
46-h Print this help message47-h Print this help message
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.
@@ -440,7 +441,12 @@
440 vlog "Cannot find '$XB_BIN' in PATH"441 vlog "Cannot find '$XB_BIN' in PATH"
441 return 1442 return 1
442 fi443 fi
443 XB_BIN="$XB_PATH"444 if [ -z "$VALGRIND" ]
445 then
446 XB_BIN="$XB_PATH"
447 else
448 XB_BIN="valgrind --error-exitcode=$VALGRIND $XB_PATH"
449 fi
444450
445 # Set the correct binary for innobackupex451 # Set the correct binary for innobackupex
446 IB_BIN="`which innobackupex`"452 IB_BIN="`which innobackupex`"
@@ -771,8 +777,9 @@
771SUBUNIT_OUT=test_results.subunit777SUBUNIT_OUT=test_results.subunit
772NWORKERS=778NWORKERS=
773DEBUG_WORKER=""779DEBUG_WORKER=""
780VALGRIND=""
774781
775while getopts "fgh?:t:s:d:c:j:T:" options; do782while getopts "fgh?:t:s:d:c:j:v:T:" options; do
776 case $options in783 case $options in
777 f ) force="yes";;784 f ) force="yes";;
778 t )785 t )
@@ -786,6 +793,15 @@
786 ;;793 ;;
787794
788 g ) DEBUG=on;;795 g ) DEBUG=on;;
796 v )
797 if [[ ! $OPTARG =~ ^[0-9]+$ ]]
798 then
799 echo "Wrong -v argument: $OPTARG"
800 exit -1
801 fi
802 VALGRIND="$OPTARG"
803 ;;
804
789 h ) usage; exit;;805 h ) usage; exit;;
790 s ) tname="$OPTARG/*.sh";;806 s ) tname="$OPTARG/*.sh";;
791 d ) export MYSQL_BASEDIR="$OPTARG";;807 d ) export MYSQL_BASEDIR="$OPTARG";;
@@ -844,7 +860,7 @@
844echo "Running against $MYSQL_FLAVOR $MYSQL_VERSION ($INNODB_FLAVOR $INNODB_VERSION)" |860echo "Running against $MYSQL_FLAVOR $MYSQL_VERSION ($INNODB_FLAVOR $INNODB_VERSION)" |
845 tee -a $OUTFILE861 tee -a $OUTFILE
846862
847echo "Using '`basename $XB_BIN`' as xtrabackup binary" | tee -a $OUTFILE863echo "Using '$XB_BIN' as xtrabackup binary" | tee -a $OUTFILE
848864
849[ -z "$NWORKERS" ] && autocalc_nworkers865[ -z "$NWORKERS" ] && autocalc_nworkers
850866
851867
=== modified file 'test/t/bug1037379.sh'
--- test/t/bug1037379.sh 2012-10-16 15:05:23 +0000
+++ test/t/bug1037379.sh 2013-11-15 18:16:05 +0000
@@ -40,7 +40,7 @@
40################################################################################40################################################################################
4141
42# The following will fail due to a timeout42# The following will fail due to a timeout
43run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \43run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --safe-slave-backup \
44 --safe-slave-backup-timeout=3 $topdir/backup144 --safe-slave-backup-timeout=3 $topdir/backup1
4545
46grep -q "Slave_open_temp_tables did not become zero" $OUTFILE46grep -q "Slave_open_temp_tables did not become zero" $OUTFILE
@@ -57,7 +57,7 @@
57run_cmd $MYSQL $MYSQL_ARGS -e "STOP SLAVE SQL_THREAD"57run_cmd $MYSQL $MYSQL_ARGS -e "STOP SLAVE SQL_THREAD"
5858
59# The following will fail due to a timeout59# The following will fail due to a timeout
60run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --safe-slave-backup \60run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --safe-slave-backup \
61 --safe-slave-backup-timeout=3 $topdir/backup261 --safe-slave-backup-timeout=3 $topdir/backup2
6262
63grep -c "Slave_open_temp_tables did not become zero" $OUTFILE | grep -w 263grep -c "Slave_open_temp_tables did not become zero" $OUTFILE | grep -w 2
6464
=== modified file 'test/t/bug1112224.sh'
--- test/t/bug1112224.sh 2013-03-18 14:13:04 +0000
+++ test/t/bug1112224.sh 2013-11-15 18:16:05 +0000
@@ -35,7 +35,7 @@
35vlog "Log applied to full backup"35vlog "Log applied to full backup"
3636
37# Command should fail and print error message37# Command should fail and print error message
38run_cmd_expect_failure $IB_BIN $IB_ARGS --apply-log --redo-only --incremental-dir=$topdir/inc \38run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --apply-log --redo-only --incremental-dir=$topdir/inc \
39 $topdir/full39 $topdir/full
40if ! grep -q "Cannot handle DDL operation" $OUTFILE40if ! grep -q "Cannot handle DDL operation" $OUTFILE
41then41then
4242
=== modified file 'test/t/bug483827.sh'
--- test/t/bug483827.sh 2013-04-27 18:46:54 +0000
+++ test/t/bug483827.sh 2013-11-15 18:16:05 +0000
@@ -2,12 +2,6 @@
2# Bug #483827: support for mysqld_multi2# Bug #483827: support for mysqld_multi
3########################################################################3########################################################################
44
5function modify_args()
6{
7 XB_ARGS=`echo $XB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'`
8 IB_ARGS=`echo $IB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'`
9}
10
11. inc/common.sh5. inc/common.sh
126
13start_server7start_server
@@ -15,14 +9,14 @@
15backup_dir=$topdir/backup9backup_dir=$topdir/backup
1610
17# change defaults file from my.cnf to my_multi.cnf11# change defaults file from my.cnf to my_multi.cnf
18modify_args12XB_ARGS=`echo $XB_ARGS | sed -e 's/my.cnf/my_multi.cnf/'`
1913
20# make my_multi.cnf14# make my_multi.cnf
21sed -e 's/\[mysqld\]/[mysqld1]/' $topdir/my.cnf > $topdir/my_multi.cnf15sed -e 's/\[mysqld\]/[mysqld1]/' $topdir/my.cnf > $topdir/my_multi.cnf
2216
23# Backup17# Backup
24innobackupex --no-timestamp --defaults-group=mysqld1 $backup_dir18innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --no-timestamp --defaults-group=mysqld1 $backup_dir
25innobackupex --apply-log $backup_dir19innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --apply-log $backup_dir
2620
27stop_server21stop_server
2822
@@ -30,7 +24,7 @@
30rm -rf ${mysql_datadir}/*24rm -rf ${mysql_datadir}/*
3125
32# restore backup26# restore backup
33innobackupex --copy-back --defaults-group=mysqld1 $backup_dir27innobackupex_no_defaults_file --defaults-file=$topdir/my_multi.cnf --copy-back --defaults-group=mysqld1 $backup_dir
3428
35# make sure that data are in correct place29# make sure that data are in correct place
36if [ ! -f ${mysql_datadir}/ibdata1 ] ; then30if [ ! -f ${mysql_datadir}/ibdata1 ] ; then
3731
=== modified file 'test/t/bug664986.sh'
--- test/t/bug664986.sh 2013-07-03 18:30:28 +0000
+++ test/t/bug664986.sh 2013-11-15 18:16:05 +0000
@@ -18,23 +18,23 @@
18# Test that wrong directory permissions result in a backup failure18# Test that wrong directory permissions result in a backup failure
19# for both InnoDB and non-InnoDB files19# for both InnoDB and non-InnoDB files
20chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb20chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb
21run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup21run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup
22chmod 777 $MYSQLD_DATADIR/test_bug664986_innodb22chmod 777 $MYSQLD_DATADIR/test_bug664986_innodb
23rm -rf $topdir/backup23rm -rf $topdir/backup
2424
25chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam25chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam
26run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup26run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup
27chmod 777 $MYSQLD_DATADIR/test_bug664986_myisam27chmod 777 $MYSQLD_DATADIR/test_bug664986_myisam
28rm -rf $topdir/backup28rm -rf $topdir/backup
2929
30# Test that wrong file permissions result in a backup failure30# Test that wrong file permissions result in a backup failure
31# for both InnoDB and non-InnoDB files31# for both InnoDB and non-InnoDB files
32chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd32chmod 000 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd
33run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup33run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup
34chmod 644 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd34chmod 644 $MYSQLD_DATADIR/test_bug664986_innodb/t.ibd
35rm -rf $topdir/backup35rm -rf $topdir/backup
3636
37chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD37chmod 000 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD
38run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp $topdir/backup38run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp $topdir/backup
39chmod 644 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD39chmod 644 $MYSQLD_DATADIR/test_bug664986_myisam/t.MYD
40rm -rf $topdir/backup40rm -rf $topdir/backup
4141
=== modified file 'test/t/bug729843.sh'
--- test/t/bug729843.sh 2013-02-05 11:54:27 +0000
+++ test/t/bug729843.sh 2013-11-15 18:16:05 +0000
@@ -12,7 +12,7 @@
12# Don't use run_cmd_* or innobackupex functions here to avoid logging12# Don't use run_cmd_* or innobackupex functions here to avoid logging
13# the full command line (including the password in plaintext)13# the full command line (including the password in plaintext)
14set +e14set +e
15$IB_BIN $IB_ARGS --password=secretpassword $topdir/backup 2>&1 | tee $logfile15$IB_BIN "${IB_ARGS[@]}" --password=secretpassword $topdir/backup 2>&1 | tee $logfile
16set -e16set -e
1717
18# Check that the password was not logged in plaintext18# Check that the password was not logged in plaintext
1919
=== modified file 'test/t/bug740489.sh'
--- test/t/bug740489.sh 2013-04-27 18:46:54 +0000
+++ test/t/bug740489.sh 2013-11-15 18:16:05 +0000
@@ -24,7 +24,7 @@
24backup_dir=$topdir/backup24backup_dir=$topdir/backup
25run_cmd $IB_BIN \25run_cmd $IB_BIN \
26 --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \26 --defaults-extra-file=$defaults_extra_file --socket=${MYSQLD_SOCKET} \
27 --ibbackup=$XB_BIN --no-timestamp $backup_dir27 "--ibbackup=$XB_BIN" --no-timestamp $backup_dir
28vlog "Backup created in directory $backup_dir"28vlog "Backup created in directory $backup_dir"
2929
30run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF30run_cmd ${MYSQL} ${MYSQL_ARGS} --password=password <<EOF
3131
=== modified file 'test/t/bug996493.sh'
--- test/t/bug996493.sh 2013-07-03 18:30:28 +0000
+++ test/t/bug996493.sh 2013-11-15 18:16:05 +0000
@@ -24,7 +24,7 @@
24# Do not run innobackupex, because it pass option --defaults-file24# Do not run innobackupex, because it pass option --defaults-file
25# which we should avoid. Our goal is to test that backup-my.cnf25# which we should avoid. Our goal is to test that backup-my.cnf
26# will be read by default when apply-log is run.26# will be read by default when apply-log is run.
27run_cmd $IB_BIN --ibbackup=$XB_BIN --apply-log $backup_dir27run_cmd $IB_BIN "--ibbackup=$XB_BIN" --apply-log $backup_dir
2828
29vlog "Get my.cnf back"29vlog "Get my.cnf back"
30mv $topdir/my.cnf.bak $topdir/my.cnf30mv $topdir/my.cnf.bak $topdir/my.cnf
3131
=== modified file 'test/t/ib_doublewrite.sh'
--- test/t/ib_doublewrite.sh 2013-07-25 15:04:49 +0000
+++ test/t/ib_doublewrite.sh 2013-11-15 18:16:05 +0000
@@ -23,13 +23,6 @@
23start_server23start_server
24load_dbase_schema incremental_sample24load_dbase_schema incremental_sample
2525
26# Workaround for bug #1072695
27IB_ARGS_NO_DEFAULTS_FILE=`echo $IB_ARGS | sed -e 's/--defaults-file=[^ ]* / /'`
28function innobackupex_no_defaults_file ()
29{
30 run_cmd $IB_BIN $IB_ARGS_NO_DEFAULTS_FILE $*
31}
32
33# Adding initial rows26# Adding initial rows
34vlog "Adding initial rows to database..."27vlog "Adding initial rows to database..."
35${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample28${MYSQL} ${MYSQL_ARGS} -e "insert into test values (1, 1);" incremental_sample
@@ -75,17 +68,20 @@
75vlog "##############"68vlog "##############"
76vlog "# PREPARE #1 #"69vlog "# PREPARE #1 #"
77vlog "##############"70vlog "##############"
71# Workaround for bug #1072695
78innobackupex_no_defaults_file --apply-log --redo-only $full_backup_dir72innobackupex_no_defaults_file --apply-log --redo-only $full_backup_dir
79vlog "Log applied to full backup"73vlog "Log applied to full backup"
80vlog "##############"74vlog "##############"
81vlog "# PREPARE #2 #"75vlog "# PREPARE #2 #"
82vlog "##############"76vlog "##############"
77# Workaround for bug #1072695
83innobackupex_no_defaults_file --apply-log --redo-only --incremental-dir=$inc_backup_dir \78innobackupex_no_defaults_file --apply-log --redo-only --incremental-dir=$inc_backup_dir \
84 $full_backup_dir79 $full_backup_dir
85vlog "Delta applied to full backup"80vlog "Delta applied to full backup"
86vlog "##############"81vlog "##############"
87vlog "# PREPARE #3 #"82vlog "# PREPARE #3 #"
88vlog "##############"83vlog "##############"
84# Workaround for bug #1072695
89innobackupex_no_defaults_file --apply-log $full_backup_dir85innobackupex_no_defaults_file --apply-log $full_backup_dir
90vlog "Data prepared for restore"86vlog "Data prepared for restore"
9187
9288
=== modified file 'test/t/ib_empty_dir.sh'
--- test/t/ib_empty_dir.sh 2012-10-15 16:14:59 +0000
+++ test/t/ib_empty_dir.sh 2013-11-15 18:16:05 +0000
@@ -22,7 +22,7 @@
22vlog "###########"22vlog "###########"
23vlog "# RESTORE #"23vlog "# RESTORE #"
24vlog "###########"24vlog "###########"
25run_cmd_expect_failure $IB_BIN $IB_ARGS --copy-back $backup_dir25run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --copy-back $backup_dir
2626
27if grep -q "is not empty!" $OUTFILE27if grep -q "is not empty!" $OUTFILE
28then28then
2929
=== modified file 'test/t/ib_slave_info.sh'
--- test/t/ib_slave_info.sh 2013-08-18 18:07:09 +0000
+++ test/t/ib_slave_info.sh 2013-11-15 18:16:05 +0000
@@ -18,7 +18,7 @@
18switch_server $slave_id18switch_server $slave_id
1919
20vlog "Check that --slave-info with --no-lock and no --safe-slave-backup fails"20vlog "Check that --slave-info with --no-lock and no --safe-slave-backup fails"
21run_cmd_expect_failure $IB_BIN $IB_ARGS --no-timestamp --slave-info --no-lock \21run_cmd_expect_failure $IB_BIN "${IB_ARGS[@]}" --no-timestamp --slave-info --no-lock \
22 $topdir/backup22 $topdir/backup
2323
24innobackupex --no-timestamp --slave-info $topdir/backup24innobackupex --no-timestamp --slave-info $topdir/backup
2525
=== modified file 'test/t/kill_long_selects.sh'
--- test/t/kill_long_selects.sh 2013-10-21 10:32:46 +0000
+++ test/t/kill_long_selects.sh 2013-11-15 18:16:05 +0000
@@ -141,7 +141,7 @@
141141
142sleep 1142sleep 1
143143
144run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \144run_cmd_expect_failure ${IB_BIN} "${IB_ARGS[@]}" $topdir/full \
145 --lock-wait-timeout=3 \145 --lock-wait-timeout=3 \
146 --lock-wait-query-type=all \146 --lock-wait-query-type=all \
147 --lock-wait-threshold=1 \147 --lock-wait-threshold=1 \
@@ -160,7 +160,7 @@
160160
161sleep 2161sleep 2
162162
163run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \163run_cmd_expect_failure ${IB_BIN} "${IB_ARGS[@]}" $topdir/full \
164 --lock-wait-timeout=3 \164 --lock-wait-timeout=3 \
165 --lock-wait-query-type=update \165 --lock-wait-query-type=update \
166 --lock-wait-threshold=2 \166 --lock-wait-threshold=2 \
167167
=== modified file 'test/t/version_check.sh'
--- test/t/version_check.sh 2013-11-07 12:23:43 +0000
+++ test/t/version_check.sh 2013-11-15 18:16:05 +0000
@@ -35,7 +35,13 @@
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!"
36fi36fi
3737
38IB_ARGS=`echo $IB_ARGS | sed -e 's/--no-version-check//g'`38for ((i=0; i < ${#IB_ARGS[@]}; i++))
39do
40 if [ "${IB_ARGS[$i]}" = "--no-version-check" ]
41 then
42 IB_ARGS=("${IB_ARGS[@]:0:$i}" "${IB_ARGS[@]:(($i + 1))}")
43 fi
44done
3945
40innobackupex --no-timestamp $topdir/backup246innobackupex --no-timestamp $topdir/backup2
4147
4248
=== modified file 'utils/build-binary.sh'
--- utils/build-binary.sh 2013-06-05 08:39:54 +0000
+++ utils/build-binary.sh 2013-11-15 18:16:05 +0000
@@ -22,7 +22,8 @@
22# Check if we have a functional getopt(1)22# Check if we have a functional getopt(1)
23if ! getopt --test23if ! getopt --test
24then24then
25 go_out="$(getopt --options="i" --longoptions=i686 \25 go_out="$(getopt --options="drvi" \
26 --longoptions="debug, relwithdebinfo, valgrind, i686" \
26 --name="$(basename "$0")" -- "$@")"27 --name="$(basename "$0")" -- "$@")"
27 test $? -eq 0 || exit 128 test $? -eq 0 || exit 1
28 eval set -- $go_out29 eval set -- $go_out
@@ -32,6 +33,18 @@
32do33do
33 case "$arg" in34 case "$arg" in
34 -- ) shift; break;;35 -- ) shift; break;;
36 -d | --debug )
37 shift
38 export DEBUG=yes
39 ;;
40 -r | --relwithdebinfo )
41 shift
42 export RELWITHDEBINFO=yes
43 ;;
44 -v | --valgrind )
45 shift
46 export VALGRIND=yes
47 ;;
35 -i | --i686 )48 -i | --i686 )
36 shift49 shift
37 TARGET="i686"50 TARGET="i686"
3851
=== modified file 'utils/build.sh'
--- utils/build.sh 2013-07-20 14:24:26 +0000
+++ utils/build.sh 2013-11-15 18:16:05 +0000
@@ -35,8 +35,20 @@
35 ;;35 ;;
36esac36esac
3737
38if [ -n "$VALGRIND" ]
39then
40 export CFLAGS="$CFLAGS -g -O0"
41 export CXXFLAGS="$CXXFLAGS -g -O0"
42 extra_config_51=
43 extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_VALGRIND=ON"
44elif [ -n "$RELWITHDEBINFO" ]
45then
46 export CFLAGS="$CFLAGS -g -O0"
47 export CXXFLAGS="$CXXFLAGS -g -O0"
48 extra_config_51=
49 extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
38# Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now50# Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now
39if [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]51elif [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
40then52then
41 # InnoDB extra debug flags53 # InnoDB extra debug flags
42 innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \54 innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \

Subscribers

People subscribed via source and target branches