From: Marco van Wieringen <mvw@planets.elm.net>
Date: Mon, 5 Apr 2010 13:42:24 +0000 (+0200)
Subject: Lets call it COMMIT and not END as that seems to be the counterpart of BEGIN for... 
X-Git-Tag: Release-5.2.1~1528
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc07788563fe82eb754e06c1e7146b6afa1c4c79;p=bacula%2Fbacula

Lets call it COMMIT and not END as that seems to be the counterpart of BEGIN for transactions. Updated Ingres lock queries to only start a transaction as the current SQL is not valid Ingres SQL.
---

diff --git a/bacula/src/cats/dbi.c b/bacula/src/cats/dbi.c
index 593b130a52..f3c360ad71 100644
--- a/bacula/src/cats/dbi.c
+++ b/bacula/src/cats/dbi.c
@@ -1283,7 +1283,7 @@ const char *my_dbi_batch_lock_path_query[5] = {
    "BEGIN",
    /* SQLite3 */
    "BEGIN",
-   /* Ingres (TODO) */
+   /* Ingres */
    "BEGIN"
 };
 
@@ -1296,7 +1296,7 @@ const char *my_dbi_batch_lock_filename_query[5] = {
    "BEGIN",
    /* SQLite3 */
    "BEGIN",
-   /* Ingres (TODO) */
+   /* Ingres */
    "BEGIN"
 };
 
@@ -1332,7 +1332,7 @@ const char *my_dbi_batch_fill_path_query[5] = {
    "INSERT INTO Path (Path)"
    " SELECT DISTINCT Path FROM batch"
    " EXCEPT SELECT Path FROM Path",
-   /* Ingres (TODO) */
+   /* Ingres */
    "INSERT INTO Path (Path) "
    "SELECT a.Path FROM "
    "(SELECT DISTINCT Path FROM batch) AS a "
@@ -1359,7 +1359,7 @@ const char *my_dbi_batch_fill_filename_query[5] = {
    "INSERT INTO Filename (Name)"
    " SELECT DISTINCT Name FROM batch "
    " EXCEPT SELECT Name FROM Filename",
-   /* Ingres (TODO) */
+   /* Ingres */
    "INSERT INTO Filename (Name) "
    "SELECT a.Name FROM "
    "(SELECT DISTINCT Name FROM batch) as a "