From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 4 Jan 2010 13:06:55 +0000 (+0100)
Subject: Fix Ingres ID definition that caused seg fault
X-Git-Tag: Release-5.0.0~94
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=466ccb1f4cf064e62ee9bd94ea079412d55925ec;p=bacula%2Fbacula

Fix Ingres ID definition that caused seg fault
---

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 94b6532abe..0eeb452839 100644
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -38,7 +38,6 @@
  * for the external world. This is control with
  * the define __SQL_C, which is defined only in sql.c
  *
- *    Version $Id: cats.h 8478 2009-02-18 20:11:55Z kerns $
  */
 
 /*
@@ -73,8 +72,8 @@ enum {
    SQL_TYPE_MYSQL      = 0,
    SQL_TYPE_POSTGRESQL = 1,
    SQL_TYPE_SQLITE     = 2,
-   SQL_TYPE_INGRES     = 3,
-   SQL_TYPE_SQLITE3
+   SQL_TYPE_SQLITE3    = 3,
+   SQL_TYPE_INGRES     = 4
 };
 
 
@@ -601,7 +600,7 @@ void               my_ingres_data_seek  (B_DB *mdb, int row);
 int                my_ingres_currval    (B_DB *mdb, const char *table_name);
 void               my_ingres_field_seek (B_DB *mdb, int row);
 INGRES_FIELD *     my_ingres_fetch_field(B_DB *mdb);
-void		   my_ingres_close	(B_DB *mdb);
+void               my_ingres_close      (B_DB *mdb);
 
 int my_ingres_batch_start(JCR *jcr, B_DB *mdb);
 int my_ingres_batch_end(JCR *jcr, B_DB *mdb, const char *error);