- ignore-builtin-innodb is deprecated

[packages/mysql.git] / percona.sh

diff --git a/percona.sh b/percona.sh
index 58680417bac585700eb28ea19b9bb7fe113c04c0..722a35a8a904ce1fd99205fc6348d4ed4347938d 100644 (file)
--- a/percona.sh
+++ b/percona.sh
@@ -1,16 +1,17 @@
 #!/bin/sh
 # updates percona patches
 # http://www.percona.com/docs/wiki/repositories:start
+# http://bazaar.launchpad.net/~percona-dev/percona-server/5.5.8/files
 # https://launchpad.net/percona-server/5.5
 # bzr branch lp:percona-server/5.5
 
 version=5.5
 bzr_branch=lp:percona-server/$version
+#version=5.5.9
+#bzr_branch=lp:percona-dev/percona-server/$version
 branch=
 
 filter_names() {
-       # mysql_dump_ignore_ct.patch is broken, therefore we skip
-       grep -v 'mysql_dump_ignore_ct.patch' | \
        grep -v 'percona-support.patch' | \
        grep -v 'mysqld_safe_syslog.patch' | \
        grep -v 'mysql-test.diff'
@@ -20,6 +21,8 @@ filter_files() {
        filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
        cd $version
        bzr pull
@@ -31,17 +34,27 @@ fi
 > .percona.spec
 > .patch.spec
 i=100
-for patch in $(cat $version/series | filter_names); do
-       file=mysql-$patch
-       cat $version/$patch | filter_files > $file
+[ -d "$version/patches" ] && dir=$version/patches || dir=$version
+for patch in $(cat $dir/series | filter_names); do
+       # if patch already existed, use mysql- prefix
+       if [ -f mysql-$patch ]; then
+               file=mysql-$patch
+       else
+               file=$patch
+       fi
+       cat $dir/$patch | filter_files > $file
 
        if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
                cvs add $file
                ${branch:+cvs up -r $branch $file}
        fi
 
-       echo >&2 "Adding: $patch"
-       printf "Patch%d:\t%s\n" $i %{name}-$patch >> .percona.spec
+       if [ "$patch" != "$file" ]; then
+               echo >&2 "Adding: $file ($patch)"
+       else
+               echo >&2 "Adding: $file"
+       fi
+       printf "Patch%d:\t%s\n" $i $(echo "$file" | sed -e 's,^mysql-,%{name}-,') >> .percona.spec
        printf "%%patch%d -p1\n" $i >> .patch.spec
        i=$((i+1))
 done