Merge lp:~stewart/percona-xtrabackup/1.6-test-mysql50 into lp:percona-xtrabackup/1.6

Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 345
Proposed branch: lp:~stewart/percona-xtrabackup/1.6-test-mysql50
Merge into: lp:percona-xtrabackup/1.6
Diff against target: 60 lines (+12/-2)
3 files modified
test/bootstrap.sh (+4/-0)
test/run.sh (+6/-1)
utils/build.sh (+2/-1)
To merge this branch: bzr merge lp:~stewart/percona-xtrabackup/1.6-test-mysql50
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+109984@code.launchpad.net

Description of the change

Support running test suite against MySQL 5.0.

I'm waiting for the 5.0 binaries to upload to S3 before creating and running new jenkins job.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/bootstrap.sh'
--- test/bootstrap.sh 2012-01-23 16:39:07 +0000
+++ test/bootstrap.sh 2012-06-13 06:17:20 +0000
@@ -33,6 +33,10 @@
33fi33fi
3434
35case "$1" in35case "$1" in
36 innodb50)
37 url="http://s3.amazonaws.com/percona.com/downloads/community"
38 tarball="mysql-5.0.96-linux-$arch-glibc23.tar.gz"
39 ;;
36 innodb51_builtin | innodb51)40 innodb51_builtin | innodb51)
37 url="http://s3.amazonaws.com/percona.com/downloads/community"41 url="http://s3.amazonaws.com/percona.com/downloads/community"
38 tarball="mysql-5.1.49-linux-$arch-glibc23.tar.gz"42 tarball="mysql-5.1.49-linux-$arch-glibc23.tar.gz"
3943
=== modified file 'test/run.sh'
--- test/run.sh 2011-07-05 03:02:01 +0000
+++ test/run.sh 2012-06-13 06:17:20 +0000
@@ -103,6 +103,8 @@
103 then103 then
104 XB_BIN=""104 XB_BIN=""
105 case "$XB_BUILD" in105 case "$XB_BUILD" in
106 "innodb50" )
107 XB_BIN="xtrabackup_51";;
106 "innodb51_builtin" )108 "innodb51_builtin" )
107 XB_BIN="xtrabackup_51";;109 XB_BIN="xtrabackup_51";;
108 "innodb51" )110 "innodb51" )
@@ -139,7 +141,10 @@
139 if [ "$XB_BUILD" = "autodetect" ]141 if [ "$XB_BUILD" = "autodetect" ]
140 then142 then
141 # Determine xtrabackup build automatically143 # Determine xtrabackup build automatically
142 if [ "${MYSQL_VERSION:0:3}" = "5.1" ]144 if [ "${MYSQL_VERSION:0:3}" = "5.0" ]
145 then
146 XB_BIN="xtrabackup_51"
147 elif [ "${MYSQL_VERSION:0:3}" = "5.1" ]
143 then148 then
144 if [ -z "$INNODB_VERSION" ]149 if [ -z "$INNODB_VERSION" ]
145 then150 then
146151
=== modified file 'utils/build.sh'
--- utils/build.sh 2011-11-29 07:04:15 +0000
+++ utils/build.sh 2012-06-13 06:17:20 +0000
@@ -25,6 +25,7 @@
25 echo25 echo
26 echo "Usage: `basename $0` CODEBASE"26 echo "Usage: `basename $0` CODEBASE"
27 echo "where CODEBASE can be one of the following values or aliases:"27 echo "where CODEBASE can be one of the following values or aliases:"
28 echo " innodb50 | 5.0 build against innodb 5.1 builtin, but should be compatible with MySQL 5.0"
28 echo " innodb51_builtin | 5.1 build against built-in InnoDB in MySQL 5.1"29 echo " innodb51_builtin | 5.1 build against built-in InnoDB in MySQL 5.1"
29 echo " innodb55 | 5.5 build against InnoDB in MySQL 5.5"30 echo " innodb55 | 5.5 build against InnoDB in MySQL 5.5"
30 echo " xtradb51 | xtradb build against Percona Server with XtraDB 5.1"31 echo " xtradb51 | xtradb build against Percona Server with XtraDB 5.1"
@@ -158,7 +159,7 @@
158top_dir=`pwd`159top_dir=`pwd`
159160
160case "$type" in161case "$type" in
161"innodb51_builtin" | "5.1")162"innodb51_builtin" | "5.1" | "innodb50" | "5.0")
162 mysql_version=$MYSQL_51_VERSION163 mysql_version=$MYSQL_51_VERSION
163 server_patch=innodb51_builtin.patch164 server_patch=innodb51_builtin.patch
164 innodb_name=innobase165 innodb_name=innobase

Subscribers

People subscribed via source and target branches