From 60e5d16e7cc671ec0eca203e643cfa49f2e4de28 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 26 Feb 2007 20:28:56 +0000
Subject: [PATCH] kes  Correct SQLite log table index as reported by Luca
 Berra.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4268 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/INSTALL                         |  5 +++--
 bacula/README                          | 10 +++-------
 bacula/src/cats/make_sqlite3_tables.in |  2 +-
 bacula/src/cats/make_sqlite_tables.in  |  2 +-
 bacula/technotes-2.1                   |  6 ++++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bacula/INSTALL b/bacula/INSTALL
index 1ddba3cfb9..2dd8a48eda 100644
--- a/bacula/INSTALL
+++ b/bacula/INSTALL
@@ -1,6 +1,7 @@
 
-This file is rather out of date, though it contains generally useful
-information. We recommend following step 1 below (i.e. see the manual).
+This file is rather out of date, and if you want to avoid a lot
+of pain, you will read the manual, which you can find at www.bacula.org 
+
 
 --------------------------------------------------------------------------
 Using GNU autoconfig
diff --git a/bacula/README b/bacula/README
index ea5a760f3d..67c06b806b 100644
--- a/bacula/README
+++ b/bacula/README
@@ -4,6 +4,8 @@ to read the online manual at:
 
   http://www.bacula.org
 
+You will save yourself a lot of pain if you read
+the manual -- it is online at the above site.
 Barring reading the manual, you might try the
 following:
 
@@ -14,19 +16,13 @@ To Configure it:
     --sysconfdir=$HOME/bacula/bin \
     --with-pid-dir=$HOME/bacula/bin \
     --with-subsys-dir=$HOME/bacula/bin \
-    --with-sqlite=$HOME/depkgs/sqlite \
     --enable-gnome \
-    --with-mysql=$HOME/mysql \
+    --with-mysql \
     --with-working-dir=$HOME/bacula/bin/working \
     --with-dump-email=YOUR_EMAIL_ADDRESS \
     --with-job-email=YOUR_EMAIL_ADDRESS \
     --with-smtp-host=YOUR_SMTP_SERVER_ADDRESS
 
-If you want to use SQLite, please download depkgs and
-build sqlite, then add something like:
-
-    --with-sqlite=$HOME/depkgs/sqlite
-
 
 Build Bacula:
 
diff --git a/bacula/src/cats/make_sqlite3_tables.in b/bacula/src/cats/make_sqlite3_tables.in
index fe44892255..9fcbb6c6c8 100644
--- a/bacula/src/cats/make_sqlite3_tables.in
+++ b/bacula/src/cats/make_sqlite3_tables.in
@@ -101,7 +101,7 @@ CREATE TABLE Log (
    LogText TEXT NOT NULL,
    PRIMARY KEY(LogId) 
    );
-CREATE INDEX LogInx1 ON File (JobId);
+CREATE INDEX LogInx1 ON Log (JobId);
 
 
 CREATE TABLE FileSet (
diff --git a/bacula/src/cats/make_sqlite_tables.in b/bacula/src/cats/make_sqlite_tables.in
index fe44892255..9fcbb6c6c8 100644
--- a/bacula/src/cats/make_sqlite_tables.in
+++ b/bacula/src/cats/make_sqlite_tables.in
@@ -101,7 +101,7 @@ CREATE TABLE Log (
    LogText TEXT NOT NULL,
    PRIMARY KEY(LogId) 
    );
-CREATE INDEX LogInx1 ON File (JobId);
+CREATE INDEX LogInx1 ON Log (JobId);
 
 
 CREATE TABLE FileSet (
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index cba72dfd39..003bba7755 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,9 +1,11 @@
               Technical notes on version 2.1
 
 General:
-24Feb08
+26Feb07
+kes  Correct SQLite log table index as reported by Luca Berra.
+24Feb07
 ebl  fix fifo stuff, bacula tries to rewind the fifo... Thanks to Andreas
-22Feb08
+22Feb07
 kes  Begin implementing new comm signals for API.
 kes  Fix a few places in lib/message.c where the open fd may 
      not be zeroed.
-- 
2.39.5