[Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. 9d713ce06d9d5a300a15aaa7d6511a8ea2f8de24

[<gi...@ba...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".

The branch, Branch-5.2 has been updated
       via  9d713ce06d9d5a300a15aaa7d6511a8ea2f8de24 (commit)
      from  d734ef031f796d5852fcc4fda08de69cda8bb3bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d713ce06d9d5a300a15aaa7d6511a8ea2f8de24
Author: Kern Sibbald <ke...@si...>
Date:   Sun Jan 15 13:21:00 2012 +0100

    Back out bad MinValue patch

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index a72b83d..0facbb2 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -656,7 +656,7 @@ int db_create_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
    }
    mdb->db_escape_string(jcr, esc, cr->Counter, strlen(cr->Counter));
    /* 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')",
         esc, cr->MinValue, cr->MaxValue, cr->CurrentValue,
         cr->WrapCounter);
diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index d1ed6d1..3062d72 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -756,7 +756,7 @@ int db_get_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
    db_lock(mdb);
    mdb->db_escape_string(jcr, esc, cr->Counter, strlen(cr->Counter));
 
-   Mmsg(mdb->cmd, "SELECT 'MinValue','MaxValue',CurrentValue,WrapCounter "
+   Mmsg(mdb->cmd, "SELECT MinValue,MaxValue,CurrentValue,WrapCounter "
       "FROM Counters WHERE Counter='%s'", esc);
 
    if (QUERY_DB(jcr, mdb, mdb->cmd)) {
diff --git a/bacula/src/cats/sql_update.c b/bacula/src/cats/sql_update.c
index 3090911..62ce20e 100644
--- a/bacula/src/cats/sql_update.c
+++ b/bacula/src/cats/sql_update.c
@@ -30,7 +30,6 @@
  *
  *    Kern Sibbald, March 2000
  *
- *    Version $Id: sql_update.c 8478 2009-02-18 20:11:55Z kerns $
  */
 
 #include "bacula.h"
@@ -254,7 +253,7 @@ int db_update_counter_record(JCR *jcr, B_DB *mdb, COUNTER_DBR *cr)
    db_lock(mdb);
    mdb->db_escape_string(jcr, esc, cr->Counter, strlen(cr->Counter));
    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, esc);


hooks/post-receive
-- 
Bacula Community source