[pkg-bacula-commits] [bacula] 07/35: Re-enable mysql upgrade patch

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to tag development/2011-04-29
in repository bacula.

commit 123a8b6782486f34717e83a33044dd4aaa089db3
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Mon Apr 18 13:17:29 2011 +0200

    Re-enable mysql upgrade patch
    
    See #569285 and http://bugs.bacula.org/view.php?id=1498 for more info
    why this is needed on upgrades 3.0 -> 5.0. Actually, since 5.0 is in
    stable, this could be removed now but let's keep it until next bacula db
    version to be safe.
---
 debian/patches/UNUSED-postgresql-fix | 11 +++++++++++
 debian/patches/UNUSED-sql-fix        | 21 ---------------------
 debian/patches/fix-mysql-upgrade     | 10 ++++++++++
 debian/patches/series                |  1 +
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/patches/UNUSED-postgresql-fix b/debian/patches/UNUSED-postgresql-fix
new file mode 100644
index 0000000..f2ba3ae
--- /dev/null
+++ b/debian/patches/UNUSED-postgresql-fix
@@ -0,0 +1,11 @@
+--- bacula-5.0.3.orig/src/cats/update_postgresql_tables.in
++++ bacula-5.0.3/src/cats/update_postgresql_tables.in
+@@ -69,8 +69,6 @@ DROP INDEX file_fp_idx;
+ -- CREATE INDEX CONCURRENTLY file_jpf_idx ON File (JobId, PathId, FilenameId)
+ -- to make it without locks (require PostgreSQL 8.2 version)
+ 
+-CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
+-
+ ANALYSE;
+ 
+ END-OF-DATA
diff --git a/debian/patches/UNUSED-sql-fix b/debian/patches/UNUSED-sql-fix
deleted file mode 100644
index 34e15f9..0000000
--- a/debian/patches/UNUSED-sql-fix
+++ /dev/null
@@ -1,21 +0,0 @@
---- bacula-5.0.3.orig/src/cats/update_mysql_tables.in
-+++ bacula-5.0.3/src/cats/update_mysql_tables.in
-@@ -15,7 +15,6 @@ db_name=@db_name@
- if mysql $* -f <<END-OF-DATA
- USE ${db_name};
- 
--ALTER TABLE JobMedia DROP Stripe ;
- ALTER TABLE JobMedia DROP Copy ;
- ALTER TABLE Job ADD COLUMN HasCache tinyint default 0 after HasBase;
- ALTER TABLE Job ADD COLUMN Reviewed tinyint default 0 after HasCache;
---- bacula-5.0.3.orig/src/cats/update_postgresql_tables.in
-+++ bacula-5.0.3/src/cats/update_postgresql_tables.in
-@@ -69,8 +69,6 @@ DROP INDEX file_fp_idx;
- -- CREATE INDEX CONCURRENTLY file_jpf_idx ON File (JobId, PathId, FilenameId)
- -- to make it without locks (require PostgreSQL 8.2 version)
- 
--CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
--
- ANALYSE;
- 
- END-OF-DATA
diff --git a/debian/patches/fix-mysql-upgrade b/debian/patches/fix-mysql-upgrade
new file mode 100644
index 0000000..6c98235
--- /dev/null
+++ b/debian/patches/fix-mysql-upgrade
@@ -0,0 +1,10 @@
+--- a/src/cats/update_mysql_tables.in
++++ b/src/cats/update_mysql_tables.in
+@@ -14,7 +14,6 @@
+ 
+ if mysql $* -f <<END-OF-DATA
+ 
+-ALTER TABLE JobMedia DROP Stripe ;
+ ALTER TABLE JobMedia DROP Copy ;
+ ALTER TABLE Job ADD COLUMN HasCache tinyint default 0 after HasBase;
+ ALTER TABLE Job ADD COLUMN Reviewed tinyint default 0 after HasCache;
diff --git a/debian/patches/series b/debian/patches/series
index cbabeb4..eea8eed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-binutils-gold
 fix-default-config
 fix-sql-bindir
 remove-use-statement-for-mysql
+fix-mysql-upgrade

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git