From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 31 Jul 2003 07:59:49 +0000 (+0000)
Subject: Doc fixes from Bob Collins + add CLIENT_FOUND_ROWS in open of MySQL
X-Git-Tag: Release-1.31~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9422799f040ac63a3371b7096a9014074dba45be;p=bacula%2Fbacula

Doc fixes from Bob Collins + add CLIENT_FOUND_ROWS in open of MySQL


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@654 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 4675fdb370..1728136f9d 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -31,6 +31,7 @@ For 1.31 release:
 
 
 For 1.32:
+- User wants to NOT backup up certain big files (email files).
 - Maybe remove multiple simultaneous devices code in SD.
 - On Windows with very long path names, it may be impossible to create 
   a file (and thus restore it) because the total length is too long.
diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c
index fff10ba24d..7f8891acf1 100644
--- a/bacula/src/cats/mysql.c
+++ b/bacula/src/cats/mysql.c
@@ -138,7 +138,7 @@ db_open_database(JCR *jcr, B_DB *mdb)
 	mdb->db_socket, 	      /* default = socket */
 	CLIENT_FOUND_ROWS);	      /* flags */
 
-   /* If no connect, try once more incase it is a timing problem */
+   /* If no connect, try once more in case it is a timing problem */
    if (mdb->db == NULL) {
       mdb->db = mysql_real_connect(
 	   &(mdb->mysql),		 /* db */
@@ -148,7 +148,7 @@ db_open_database(JCR *jcr, B_DB *mdb)
 	   mdb->db_name,		 /* database name */
 	   mdb->db_port,		 /* default port */
 	   mdb->db_socket,		 /* default = socket */
-	   0);				 /* flags = none */
+	   CLIENT_FOUND_ROWS);		 /* flags */
    }
     
    Dmsg0(50, "mysql_real_connect done\n");
diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 99c8577b9f..043076b4d9 100644
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -334,7 +334,7 @@ struct s_jl joblevels[] = {
    {"Differential",  L_DIFFERENTIAL,    JT_BACKUP},
    {"Since",         L_SINCE,           JT_BACKUP},
    {"Catalog",       L_VERIFY_CATALOG,  JT_VERIFY},
-   {"Initcatalog",   L_VERIFY_INIT,     JT_VERIFY},
+   {"InitCatalog",   L_VERIFY_INIT,     JT_VERIFY},
    {"VolumeToCatalog", L_VERIFY_VOLUME_TO_CATALOG,   JT_VERIFY},
    {"Data",          L_VERIFY_DATA,     JT_VERIFY},
    {NULL,	     0}
diff --git a/bacula/src/stored/bacula-sd.conf.in b/bacula/src/stored/bacula-sd.conf.in
index f18a7a6a08..3d6b277fce 100644
--- a/bacula/src/stored/bacula-sd.conf.in
+++ b/bacula/src/stored/bacula-sd.conf.in
@@ -35,7 +35,7 @@ Device {
   Name = FileStorage
   Media Type = File
   Archive Device = /tmp
-  LabelMedia = yes;                   # lets Bacula label unlabelled media
+  LabelMedia = yes;                   # lets Bacula label unlabeled media
   Random Access = Yes;
   AutomaticMount = yes;               # when device opened, read it
   RemovableMedia = no;