From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 22 Oct 2007 10:31:08 +0000 (+0000)
Subject: kes  Apply 2.2.5-postgresql-errors.patch
X-Git-Tag: Release-2.2.6~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3223a2b5ddddd62b5ac9bfe67c2440419fa2eac;p=bacula%2Fbacula

kes  Apply 2.2.5-postgresql-errors.patch
kes  Remove unneeded File table index on JobId, which is already
     present as the first index of another multi-index.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5778 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index f774612a23..e399624307 100644
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -498,7 +498,7 @@ extern const char* my_pg_batch_fill_path_query;
 #define sql_fetch_row(x)      my_postgresql_fetch_row(x)
 #define sql_query(x, y)       my_postgresql_query((x), (y))
 #define sql_close(x)          PQfinish((x)->db)
-#define sql_strerror(x)       PQresultErrorMessage((x)->result)
+#define sql_strerror(x)       PQerrorMessage((x)->db)
 #define sql_num_rows(x)       ((unsigned) PQntuples((x)->result))
 #define sql_data_seek(x, i)   my_postgresql_data_seek((x), (i))
 #define sql_affected_rows(x)  ((unsigned) atoi(PQcmdTuples((x)->result)))
diff --git a/bacula/src/cats/make_mysql_tables.in b/bacula/src/cats/make_mysql_tables.in
index 513e5da2c4..7a075dd5d7 100644
--- a/bacula/src/cats/make_mysql_tables.in
+++ b/bacula/src/cats/make_mysql_tables.in
@@ -38,7 +38,6 @@ CREATE TABLE File (
    LStat TINYBLOB NOT NULL,
    MD5 TINYBLOB,
    PRIMARY KEY(FileId),
-   INDEX (JobId),
    INDEX (JobId, PathId, FilenameId)
    );
 
@@ -50,7 +49,6 @@ CREATE TABLE File (
 #  INDEX (PathId),
 #  INDEX (FilenameId),
 #  INDEX (FilenameId, PathId)
-#  INDEX (JobId),
 #
 
 CREATE TABLE MediaType (
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 2a5656b891..bde12ccc32 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.2
 
 General:
+22Oct07
+kes  Apply 2.2.5-postgresql-errors.patch
+kes  Remove unneeded File table index on JobId, which is already
+     present as the first index of another multi-index.
 19Oct07
 kes  Set default debug_level to zero. This corrects bugs #991 and #993. 
 kes  Fix a crash in bat when it cannot connect to the Director for example