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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit f38cf56572f9460d7ddb0324e355459780ea9971
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Thu May 31 02:13:45 2012 +0400

    fix MySQL 5.5 syntax patch

diff --git a/debian/patches/fix-mysql55-sql-syntax.patch b/debian/patches/fix-mysql55-sql-syntax.patch
index 0df3036..cb58378 100644
--- a/debian/patches/fix-mysql55-sql-syntax.patch
+++ b/debian/patches/fix-mysql55-sql-syntax.patch
@@ -1,6 +1,7 @@
 Description: Fix MySQL 5.5 SQL Syntax (MaxValue is reserved world)
 Bug-Debian: 674809
 Bug: http://bugs.bacula.org/view.php?id=1504
+Author: Corey Hickey <bugfood-c at fatooh.org>
 Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
 Last-Update: 2012-05-29
 
@@ -30,7 +31,7 @@ index e3d4f74..ad84e67 100644
  
     /* Must create it */
 -   Mmsg(mdb->cmd, "INSERT INTO Counters (Counter,MinValue,MaxValue,CurrentValue,"
-+   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);
@@ -43,7 +44,7 @@ index 13f053b..e9d3bcc 100644
  
     db_lock(mdb);
 -   Mmsg(mdb->cmd, "SELECT MinValue,MaxValue,CurrentValue,WrapCounter "
-+   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)) {
@@ -56,7 +57,7 @@ index 30f60fd..5ac95e5 100644
  
     Mmsg(mdb->cmd,
 -"UPDATE Counters SET MinValue=%d,MaxValue=%d,CurrentValue=%d,"
-+"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);

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