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 4675fdb370ea98cebd3e3defef4ee4c83f2720bc..1728136f9d98f9a055b0ef0ad9ff9cc862af87bb 100644 (file)
--- 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 fff10ba24da79854e3297649bc978942f1b854cd..7f8891acf1e7ea1a747d8b2c975d886be0fecd3c 100644 (file)
--- 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 99c8577b9fda4dca4bcb7581605ad1c0ae17c107..043076b4d9a51b9f07cda1bb2272c078db8adbc5 100644 (file)
--- 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 f18a7a6a08e557987fc0ba14fe199212d6355130..3d6b277fced221a50e4d0093a08ee0b9a1a8b21e 100644 (file)
--- 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;