From 52fdce142cdc8bde9e38ac65ca7701c50d18d0bc Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 15 Jan 2012 13:21:00 +0100 Subject: [PATCH] Back out bad MinValue patch --- bacula/src/cats/sql_create.c | 2 +- bacula/src/cats/sql_get.c | 2 +- bacula/src/cats/sql_update.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c index a72b83dc25..0facbb2a79 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 d1ed6d13e2..3062d729f4 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 3090911ea5..62ce20ec19 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); -- 2.39.5