From: Marco van Wieringen <mvw@planets.elm.net>
Date: Fri, 16 Apr 2010 07:29:45 +0000 (+0200)
Subject: Remove some strange includes halve way this file which seems to be some copied code... 
X-Git-Tag: Release-7.0.0~1938
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3fc08c92dfbbc78fb281b4cf4ed538e664cabef7;p=bacula%2Fbacula

Remove some strange includes halve way this file which seems to be some copied code from the top of the file.
---

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index 10bdbbdf35..7cb83313e5 100644
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -27,11 +27,11 @@
 */
 /*
  *
- *  This file contains all the SQL commands issued by the Director
+ *  This file contains all the SQL commands that are either issued by the
+ *  Director or which are database backend specific.
  *
  *     Kern Sibbald, July MMII
  *
- *   Version $Id$
  */
 /*
  * Note, PostgreSQL imposes some constraints on using DISTINCT and GROUP BY
@@ -40,7 +40,6 @@
  *  because all the ORDER BY expressions must appear in the SELECT list!
  */
 
-
 #include "bacula.h"
 #include "cats.h"
 
@@ -430,26 +429,6 @@ const char *uar_jobids_fileindex =
 const char *uar_jobid_fileindex_from_table = 
    "SELECT JobId,FileIndex from %s";
 
-
-/*
- *
- *  This file contains all the SQL commands issued by the Director
- *
- *     Kern Sibbald, July MMII
- *
- *   Version $Id$
- */
-/*
- * Note, PostgreSQL imposes some constraints on using DISTINCT and GROUP BY
- *  for example, the following is illegal in PostgreSQL:
- *  SELECT DISTINCT JobId FROM temp ORDER BY StartTime ASC;
- *  because all the ORDER BY expressions must appear in the SELECT list!
- */
-
-
-#include "bacula.h"
-#include "cats.h"
-
 /* Get the list of the last recent version with a given jobid list 
  * This is a tricky part because with SQL the result of 
  *