Merge lp:~laurynas-biveinis/percona-xtrabackup/bug1142229-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/186/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-02-20 10:20:00 +0000
+++ utils/build.sh	2013-03-04 04:59:29 +0000
@@ -12,8 +12,24 @@
 
 top_dir=`pwd`
 
+# Set the build type and resolve synonyms
+case "$1" in
+"plugin" )
+        type="innodb51"
+        ;;
+"5.5" )
+        type="innodb55"
+        ;;
+"xtradb" )
+        type="xtradb51"
+        ;;
+*)
+        type=$1
+        ;;
+esac
+
 # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now
-if [ -n "$DEBUG" -a "$1" != "galera55" -a "$1" != "xtradb55" -a "$1" != "xtradb51" -a "$1" != "xtradb" ]
+if [ -n "$DEBUG" -a "$type" != "galera55" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
 then
     # InnoDB extra debug flags
     innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \
@@ -188,10 +204,8 @@
 	usage
 fi
 
-type=$1
-
 case "$type" in
-"innodb51" | "plugin")
+"innodb51")
        mysql_version=$MYSQL_51_VERSION
        server_patch=innodb51.patch
        innodb_name=innodb_plugin
@@ -205,7 +219,7 @@
 
        build_all
        ;;
-"innodb55" | "5.5")
+"innodb55")
 	mysql_version=$MYSQL_55_VERSION
 	server_patch=innodb55.patch
 	innodb_name=innobase
@@ -222,7 +236,7 @@
 	build_all
 	;;
 
-"xtradb51" | "xtradb" | "mariadb51" | "mariadb52" | "mariadb53")
+"xtradb51" | "mariadb51" | "mariadb52" | "mariadb53")
 	server_dir=$top_dir/Percona-Server
 	branch_dir=percona-server-5.1-xtrabackup
 	innodb_dir=$server_dir/storage/innodb_plugin