[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-110-gbb3163d

[Alexander Golovko]

The following commit has been merged in the master branch:
commit bb3163d182a28edbe38877f1ab502c46c9dd5567
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue May 29 18:10:03 2012 +0400

    fix incorrect sql syntax on mysql55

diff --git a/debian/changelog b/debian/changelog
index 9331daf..8c5c217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
   * debian/bacula-fd.init, debian/bacula-sd.init, 
     debian/bacula-director-db.bacula-director.init.in:
     + Add LSB Description.
+  * debian/patches/fix-mysql55-sql-syntax.patch (Closes: #674809):
+    + Fix installation on MySQL 5.5, thanks to 
+      Corey Hickey <bugfood-c at fatooh.org>.
 
   [ Bartosz Cisek ]
   * debian/rules:
diff --git a/debian/patches/fix-mysql55-sql-syntax.patch b/debian/patches/fix-mysql55-sql-syntax.patch
new file mode 100644
index 0000000..0df3036
--- /dev/null
+++ b/debian/patches/fix-mysql55-sql-syntax.patch
@@ -0,0 +1,62 @@
+Description: Fix MySQL 5.5 SQL Syntax (MaxValue is reserved world)
+Bug-Debian: 674809
+Bug: http://bugs.bacula.org/view.php?id=1504
+Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-05-29
+
+Must be removed after update to 5.2.x
+
+diff --git a/src/cats/make_mysql_tables.in b/src/cats/make_mysql_tables.in
+index 37a10d2..6cf24a3 100644
+--- a/src/cats/make_mysql_tables.in
++++ b/src/cats/make_mysql_tables.in
+@@ -324,8 +324,8 @@ CREATE TABLE UnsavedFiles (
+ 
+ CREATE TABLE Counters (
+    Counter TINYBLOB NOT NULL,
+-   MinValue INTEGER DEFAULT 0,
+-   MaxValue INTEGER DEFAULT 0,
++   `MinValue` INTEGER DEFAULT 0,
++   `MaxValue` INTEGER DEFAULT 0,
+    CurrentValue INTEGER DEFAULT 0,
+    WrapCounter TINYBLOB NOT NULL,
+    PRIMARY KEY (Counter(128))
+diff --git a/src/cats/sql_create.c b/src/cats/sql_create.c
+index e3d4f74..ad84e67 100644
+--- a/src/cats/sql_create.c
++++ b/src/cats/sql_create.c
+@@ -627,7 +627,7 @@ int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+    }
+ 
+    /* Must create it */
+-   Mmsg(mdb->cmd, "INSERT INTO Counters (Counter,MinValue,MaxValue,CurrentValue,"
++   Mmsg(mdb->cmd, "INSERT INTO Counters (Counter,\"MinValue\",\"MaxValue\",CurrentValue,"
+       "WrapCounter) VALUES ('%s','%d','%d','%d','%s')",
+       cr->Counter, cr->MinValue, cr->MaxValue, cr->CurrentValue,
+       cr->WrapCounter);
+diff --git a/src/cats/sql_get.c b/src/cats/sql_get.c
+index 13f053b..e9d3bcc 100644
+--- a/src/cats/sql_get.c
++++ b/src/cats/sql_get.c
+@@ -730,7 +730,7 @@ int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+    SQL_ROW row;
+ 
+    db_lock(mdb);
+-   Mmsg(mdb->cmd, "SELECT MinValue,MaxValue,CurrentValue,WrapCounter "
++   Mmsg(mdb->cmd, "SELECT \"MinValue\",\"MaxValue\",CurrentValue,WrapCounter "
+       "FROM Counters WHERE Counter='%s'", cr->Counter);
+ 
+    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
+diff --git a/src/cats/sql_update.c b/src/cats/sql_update.c
+index 30f60fd..5ac95e5 100644
+--- a/src/cats/sql_update.c
++++ b/src/cats/sql_update.c
+@@ -243,7 +243,7 @@ int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
+    db_lock(mdb);
+ 
+    Mmsg(mdb->cmd,
+-"UPDATE Counters SET MinValue=%d,MaxValue=%d,CurrentValue=%d,"
++"UPDATE Counters SET \"MinValue\"=%d,\"MaxValue\"=%d,CurrentValue=%d,"
+ "WrapCounter='%s' WHERE Counter='%s'",
+       cr->MinValue, cr->MaxValue, cr->CurrentValue,
+       cr->WrapCounter, cr->Counter);
diff --git a/debian/patches/series b/debian/patches/series
index 86451d6..3956857 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix-readline-ncurses-depends.patch
 remove-use-statement-for-mysql
 fix-example-script-syntax
 fix-manpages
+fix-mysql55-sql-syntax.patch

-- 
Bacula, a network backup, recovery and verification program