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
1=== modified file 'test/bootstrap.sh'
2--- test/bootstrap.sh 2012-01-23 16:39:07 +0000
3+++ test/bootstrap.sh 2012-06-13 06:17:20 +0000
4@@ -33,6 +33,10 @@
5 fi
6
7 case "$1" in
8+ innodb50)
9+ url="http://s3.amazonaws.com/percona.com/downloads/community"
10+ tarball="mysql-5.0.96-linux-$arch-glibc23.tar.gz"
11+ ;;
12 innodb51_builtin | innodb51)
13 url="http://s3.amazonaws.com/percona.com/downloads/community"
14 tarball="mysql-5.1.49-linux-$arch-glibc23.tar.gz"
15
16=== modified file 'test/run.sh'
17--- test/run.sh 2011-07-05 03:02:01 +0000
18+++ test/run.sh 2012-06-13 06:17:20 +0000
19@@ -103,6 +103,8 @@
20 then
21 XB_BIN=""
22 case "$XB_BUILD" in
23+ "innodb50" )
24+ XB_BIN="xtrabackup_51";;
25 "innodb51_builtin" )
26 XB_BIN="xtrabackup_51";;
27 "innodb51" )
28@@ -139,7 +141,10 @@
29 if [ "$XB_BUILD" = "autodetect" ]
30 then
31 # Determine xtrabackup build automatically
32- if [ "${MYSQL_VERSION:0:3}" = "5.1" ]
33+ if [ "${MYSQL_VERSION:0:3}" = "5.0" ]
34+ then
35+ XB_BIN="xtrabackup_51"
36+ elif [ "${MYSQL_VERSION:0:3}" = "5.1" ]
37 then
38 if [ -z "$INNODB_VERSION" ]
39 then
40
41=== modified file 'utils/build.sh'
42--- utils/build.sh 2011-11-29 07:04:15 +0000
43+++ utils/build.sh 2012-06-13 06:17:20 +0000
44@@ -25,6 +25,7 @@
45 echo
46 echo "Usage: `basename $0` CODEBASE"
47 echo "where CODEBASE can be one of the following values or aliases:"
48+ echo " innodb50 | 5.0 build against innodb 5.1 builtin, but should be compatible with MySQL 5.0"
49 echo " innodb51_builtin | 5.1 build against built-in InnoDB in MySQL 5.1"
50 echo " innodb55 | 5.5 build against InnoDB in MySQL 5.5"
51 echo " xtradb51 | xtradb build against Percona Server with XtraDB 5.1"
52@@ -158,7 +159,7 @@
53 top_dir=`pwd`
54
55 case "$type" in
56-"innodb51_builtin" | "5.1")
57+"innodb51_builtin" | "5.1" | "innodb50" | "5.0")
58 mysql_version=$MYSQL_51_VERSION
59 server_patch=innodb51_builtin.patch
60 innodb_name=innobase

Subscribers

People subscribed via source and target branches