Change old get_Jobxxx to getJobxxx

[bacula/bacula] / bacula / src / cats / dbi.c

diff --git a/bacula/src/cats/dbi.c b/bacula/src/cats/dbi.c
index ea089a195504da82c59a1f96c325217fcfee6adb..7a039ba2551fa59839dbc50b9e57daba7175cb04 100644 (file)
--- a/bacula/src/cats/dbi.c
+++ b/bacula/src/cats/dbi.c
@@ -278,10 +278,9 @@ db_open_database(JCR *jcr, B_DB *mdb)
    }
 
    if ( dbstat != 0 ) {
-      Mmsg3(&mdb->errmsg, _("Unable to connect to DBI interface.\n"
-                       "Type=%s Database=%s User=%s\n"
-                       "It is probably not running or your password is incorrect.\n"),
-                        mdb->db_driver, mdb->db_name, mdb->db_user);
+      Mmsg3(&mdb->errmsg, _("Unable to connect to DBI interface. Type=%s Database=%s User=%s\n"
+         "Possible causes: SQL server not running; password incorrect; max_connections exceeded.\n"),
+         mdb->db_driver, mdb->db_name, mdb->db_user);
       V(mutex);
       return 0;
    }
@@ -1282,6 +1281,17 @@ const char *my_dbi_batch_unlock_tables_query[4] = {
    /* SQLite3 */
    "COMMIT"};
 
+const char *my_dbi_match[4] = {
+   /* Mysql */
+   "MATCH",
+   /* Postgresql */
+   "~",
+   /* SQLite */
+   "MATCH",
+   /* SQLite3 */
+   "MATCH"
+};
+
 const char *my_dbi_batch_fill_path_query[4] = {
    /* Mysql */
    "INSERT INTO Path (Path) "