Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tsarev/percona-server/5.5_fix_bug_800566 into lp:percona-server/5.5

  1. 5.5_fix_bug_800566
  2. Merge into 5.5
Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 130
Proposed branch: lp:~tsarev/percona-server/5.5_fix_bug_800566
Merge into: lp:percona-server/5.5
Diff against target: 95 lines (+23/-19)
2 files modified
Makefile (+7/-1)
normalize_patches.sh (+16/-18)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.5_fix_bug_800566
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+65482@code.launchpad.net

Description of the change

fix bug #800566
sync build & helper scripts between PS 5.1 and PS 5.5

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

  * [BUILD] http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/18/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2011-06-20 08:13:54 +0000
+++ Makefile 2011-06-22 12:01:46 +0000
@@ -2,7 +2,9 @@
2MASTER_SITE=http://www.percona.com/downloads/community2MASTER_SITE=http://www.percona.com/downloads/community
3MYSQL_VERSION=5.5.133MYSQL_VERSION=5.5.13
4PERCONA_SERVER_VERSION=rel20.44PERCONA_SERVER_VERSION=rel20.4
5PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)5PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
6PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
7PERCONA_SERVER_SHORT_2 ?=Percona-Server
6DEBUG_DIR ?= $(PERCONA_SERVER)-debug8DEBUG_DIR ?= $(PERCONA_SERVER)-debug
7RELEASE_DIR ?= $(PERCONA_SERVER)-release9RELEASE_DIR ?= $(PERCONA_SERVER)-release
8SERIES ?=series10SERIES ?=series
@@ -70,8 +72,12 @@
70 @echo "Prepare Percona Server sources"72 @echo "Prepare Percona Server sources"
71 rm -rf mysql-$(MYSQL_VERSION)73 rm -rf mysql-$(MYSQL_VERSION)
72 rm -rf $(PERCONA_SERVER);74 rm -rf $(PERCONA_SERVER);
75 rm -rf $(PERCONA_SERVER_SHORT_1);
76 rm -rf $(PERCONA_SERVER_SHORT_2);
73 tar zxf mysql-$(MYSQL_VERSION).tar.gz77 tar zxf mysql-$(MYSQL_VERSION).tar.gz
74 mv mysql-$(MYSQL_VERSION) $(PERCONA_SERVER)78 mv mysql-$(MYSQL_VERSION) $(PERCONA_SERVER)
79 ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
80 ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
75 (cat `cat $(SERIES)`) | patch -p1 -d $(PERCONA_SERVER)81 (cat `cat $(SERIES)`) | patch -p1 -d $(PERCONA_SERVER)
76 rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h82 rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h
7783
7884
=== modified file 'normalize_patches.sh'
--- normalize_patches.sh 2011-06-21 17:08:45 +0000
+++ normalize_patches.sh 2011-06-22 12:01:46 +0000
@@ -1,30 +1,29 @@
1#!/usr/bin/env bash1#!/usr/bin/env bash
2#ls -1 *.patch | grep -v repair | xargs bzr revert2
3MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \3MYSQL_VERSION="$(grep ^MYSQL_VERSION= "Makefile" \
4 | cut -d = -f 2)"4 | cut -d = -f 2)"
5test -z ${MYSQL_DIR} && MYSQL_DIR=mysql-${MYSQL_VERSION}5PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "Makefile" \
6test -z ${MYSQL_TAR_GZ} && MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz6 | cut -d = -f 2)"
7test -z ${SERIES} && SERIES=series7PERCONA_SERVER="Percona-Server-${MYSQL_VERSION}-${PERCONA_SERVER_VERSION}"
8echo MYSQL_VERSION=$MYSQL_VERSION8MYSQL_DIR=mysql-${MYSQL_VERSION}
9echo MYSQL_DIR=$MYSQL_DIR9MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz
10echo MYSQL_TAR_GZ=$MYSQL_TAR_GZ10
11echo SERIES=$SERIES
12echo "===== Prepare source code for patch's adaptation...";11echo "===== Prepare source code for patch's adaptation...";
13echo "===== Remove 'a' copy...";12echo "===== Remove 'a' copy...";
14rm -rf a;13rm -rf a;
15echo "===== Remove 'b' copy..."14echo "===== Remove 'b' copy..."
16rm -rf b;15rm -rf b;
17echo "===== Remove 'Percona-Server' copy..."16echo "===== Remove '${PERCONA_SERVER}' copy..."
18rm -rf Percona-Server;17rm -rf ${PERCONA_SERVER};
19echo "===== Unpack ${MYSQL_DIR} to Percona-Server..."18echo "===== Unpack ${MYSQL_DIR} to ${PERCONA_SERVER}..."
20tar zxf ${MYSQL_TAR_GZ};19tar zxf ${MYSQL_TAR_GZ};
21mv ${MYSQL_DIR} Percona-Server;20mv ${MYSQL_DIR} ${PERCONA_SERVER};
22echo "===== Prepare 'a' copy..."21echo "===== Prepare 'a' copy..."
23cp -R Percona-Server a;22cp -R ${PERCONA_SERVER} a;
24echo "===== Prepare 'b' copy..."23echo "===== Prepare 'b' copy..."
25cp -R Percona-Server b;24cp -R ${PERCONA_SERVER} b;
26echo "===== Ok, let's go patch adaptation..."25echo "===== Ok, let's go patch adaptation..."
27for patch_name in `cat ${SERIES}`; do26for patch_name in `cat series`; do
28 echo "========================================================="27 echo "========================================================="
29 echo "===== Check patch $patch_name";28 echo "===== Check patch $patch_name";
30 echo "===== Apply patch $patch_name...";29 echo "===== Apply patch $patch_name...";
@@ -38,16 +37,15 @@
38 exit 1;37 exit 1;
39 fi;38 fi;
40 if [ $hunk -ne 0 ]; then39 if [ $hunk -ne 0 ]; then
41 find b -name "*.orig" | xargs rm;
42 ./regenerate_patch.sh a b $patch_name40 ./regenerate_patch.sh a b $patch_name
43 fi;41 fi;
44 patch -p1 -d Percona-Server < $patch_name > /dev/null;42 patch -p1 -d ${PERCONA_SERVER} < $patch_name > /dev/null;
45 patch -p1 -d a < $patch_name > /dev/null;43 patch -p1 -d a < $patch_name > /dev/null;
46 echo "===== Patch $patch_name regenerated succesfully"44 echo "===== Patch $patch_name regenerated succesfully"
47 if [ $hunk -ne 0 ]; then45 if [ $hunk -ne 0 ]; then
48 echo "===== Remove temporary 'b' version"46 echo "===== Remove temporary 'b' version"
49 rm -rf b;47 rm -rf b;
50 echo "===== Prepare 'b' copy..."48 echo "===== Prepare 'b' copy..."
51 cp -R Percona-Server b;49 cp -R ${PERCONA_SERVER} b;
52 fi;50 fi;
53done;51done;

Subscribers

People subscribed via source and target branches