many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
mdb->ref_count++;
V(mutex);
+ Dmsg3(100, "initdb ref=%d connected=%d db=%p\n", mdb->ref_count,
+ mdb->connected, mdb->db);
return mdb; /* already open */
}
}
mdb->path = get_pool_memory(PM_FNAME);
mdb->esc_name = get_pool_memory(PM_FNAME);
mdb->esc_path = get_pool_memory(PM_FNAME);
+ mdb->allow_transactions = mult_db_connections;
qinsert(&db_list, &mdb->bq); /* put db in list */
+ Dmsg3(100, "initdb ref=%d connected=%d db=%p\n", mdb->ref_count,
+ mdb->connected, mdb->db);
V(mutex);
return mdb;
}
V(mutex);
return 1;
}
- mdb->connected = false;
if ((errstat=rwl_init(&mdb->lock)) != 0) {
+ berrno be;
Mmsg1(&mdb->errmsg, _("Unable to initialize DB lock. ERR=%s\n"),
- strerror(errstat));
+ be.bstrerror(errstat));
V(mutex);
return 0;
}
/* connect to the database */
-#ifdef HAVE_EMBEDDED_MYSQL
- mysql_server_init(0, NULL, NULL);
+#ifdef xHAVE_EMBEDDED_MYSQL
+// mysql_server_init(0, NULL, NULL);
#endif
- mysql_init(&(mdb->mysql));
+ mysql_init(&mdb->mysql);
+
Dmsg0(50, "mysql_init done\n");
/* If connection fails, try at 5 sec intervals for 30 seconds. */
for (int retry=0; retry < 6; retry++) {
return 0;
}
+ mdb->connected = true;
if (!check_tables_version(jcr, mdb)) {
V(mutex);
return 0;
}
-#ifdef HAVE_THREAD_SAFE_MYSQL
- my_thread_init();
-#endif
+ Dmsg3(100, "opendb ref=%d connected=%d db=%p\n", mdb->ref_count,
+ mdb->connected, mdb->db);
+
+ /* Set connection timeout to 8 days specialy for batch mode */
+ sql_query(mdb, "SET wait_timeout=691200");
+ sql_query(mdb, "SET interactive_timeout=691200");
- mdb->connected = true;
V(mutex);
return 1;
}
}
db_end_transaction(jcr, mdb);
P(mutex);
+ sql_free_result(mdb);
mdb->ref_count--;
-#if defined(HAVE_THREAD_SAFE_MYSQL)
- my_thread_end();
-#endif
+ Dmsg3(100, "closedb ref=%d connected=%d db=%p\n", mdb->ref_count,
+ mdb->connected, mdb->db);
if (mdb->ref_count == 0) {
qdchain(&mdb->bq);
- if (mdb->connected && mdb->db) {
- sql_close(mdb);
-#ifdef HAVE_EMBEDDED_MYSQL
- mysql_server_end();
+ if (mdb->connected) {
+ Dmsg1(100, "close db=%p\n", mdb->db);
+ mysql_close(&mdb->mysql);
+
+#ifdef xHAVE_EMBEDDED_MYSQL
+// mysql_server_end();
#endif
}
rwl_destroy(&mdb->lock);
V(mutex);
}
+/*
+ * This call is needed because the message channel thread
+ * opens a database on behalf of a jcr that was created in
+ * a different thread. MySQL then allocates thread specific
+ * data, which is NOT freed when the original jcr thread
+ * closes the database. Thus the msgchan must call here
+ * to cleanup any thread specific data that it created.
+ */
+void db_thread_cleanup()
+{
+#ifndef HAVE_WIN32
+ my_thread_end();
+#endif
+}
+
/*
* Return the next unique index (auto-increment) for
* the given table. Return NULL on error.
* the escaped output.
*/
void
-db_escape_string(char *snew, char *old, int len)
+db_escape_string(JCR *jcr, B_DB *mdb, char *snew, char *old, int len)
{
- mysql_escape_string(snew, old, len);
-
-#ifdef DO_IT_MYSELF
-
-/* Should use mysql_real_escape_string ! */
-unsigned long mysql_real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length);
-
- char *n, *o;
-
- n = snew;
- o = old;
- while (len--) {
- switch (*o) {
- case 0:
- *n++= '\\';
- *n++= '0';
- o++;
- break;
- case '\n':
- *n++= '\\';
- *n++= 'n';
- o++;
- break;
- case '\r':
- *n++= '\\';
- *n++= 'r';
- o++;
- break;
- case '\\':
- *n++= '\\';
- *n++= '\\';
- o++;
- break;
- case '\'':
- *n++= '\\';
- *n++= '\'';
- o++;
- break;
- case '"':
- *n++= '\\';
- *n++= '"';
- o++;
- break;
- case '\032':
- *n++= '\\';
- *n++= 'Z';
- o++;
- break;
- default:
- *n++= *o++;
- }
- }
- *n = 0;
-#endif
+ mysql_real_escape_string(mdb->db, snew, old, len);
}
/*
* Submit a general SQL command (cmd), and for each row returned,
* the sqlite_handler is called with the ctx.
*/
-int db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
+bool db_sql_query(B_DB *mdb, const char *query, DB_RESULT_HANDLER *result_handler, void *ctx)
{
SQL_ROW row;
bool send = true;
if (sql_query(mdb, query) != 0) {
Mmsg(mdb->errmsg, _("Query failed: %s: ERR=%s\n"), query, sql_strerror(mdb));
db_unlock(mdb);
- return 0;
+ return false;
}
if (result_handler != NULL) {
if ((mdb->result = sql_use_result(mdb)) != NULL) {
- int num_fields = 0;
+ int num_fields = sql_num_fields(mdb);
/* We *must* fetch all rows */
while ((row = sql_fetch_row(mdb)) != NULL) {
* seen all the data it wants. However, we
* loop to the end of the data.
*/
- num_fields++;
if (result_handler(ctx, num_fields, row)) {
send = false;
}
}
}
db_unlock(mdb);
- return 1;
+ return true;
+
+}
+void my_mysql_free_result(B_DB *mdb)
+{
+ db_lock(mdb);
+ if (mdb->result) {
+ mysql_free_result(mdb->result);
+ mdb->result = NULL;
+ }
+ db_unlock(mdb);
}
-char *my_mysql_batch_lock_path_query = "LOCK TABLES Path write, "
- " batch write, "
- " Path as p write ";
-
-
-char *my_mysql_batch_lock_filename_query = "LOCK TABLES Filename write, "
- " batch write, "
- " Filename as f write ";
-
-char *my_mysql_batch_unlock_tables_query = "UNLOCK TABLES";
-
-char *my_mysql_batch_fill_path_query = "INSERT INTO Path (Path) "
- " SELECT a.Path FROM "
- " (SELECT DISTINCT Path "
- " FROM batch) AS a "
- " WHERE NOT EXISTS "
- " (SELECT Path "
- " FROM Path AS p "
- " WHERE p.Path = a.Path) ";
-
-char *my_mysql_batch_fill_filename_query = "INSERT INTO Filename (Name) "
- " SELECT a.Name FROM "
- " (SELECT DISTINCT Name "
- " FROM batch) AS a "
- " WHERE NOT EXISTS "
- " (SELECT Name "
- " FROM Filename AS f "
- " WHERE f.Name = a.Name) ";
+#ifdef HAVE_BATCH_FILE_INSERT
+const char *my_mysql_batch_lock_path_query =
+ "LOCK TABLES Path write, batch write, Path as p write";
+
+
+const char *my_mysql_batch_lock_filename_query =
+ "LOCK TABLES Filename write, batch write, Filename as f write";
+
+const char *my_mysql_batch_unlock_tables_query = "UNLOCK TABLES";
+
+const char *my_mysql_batch_fill_path_query =
+ "INSERT INTO Path (Path) "
+ "SELECT a.Path FROM "
+ "(SELECT DISTINCT Path FROM batch) AS a WHERE NOT EXISTS "
+ "(SELECT Path FROM Path AS p WHERE p.Path = a.Path)";
+
+const char *my_mysql_batch_fill_filename_query =
+ "INSERT INTO Filename (Name) "
+ "SELECT a.Name FROM "
+ "(SELECT DISTINCT Name FROM batch) AS a WHERE NOT EXISTS "
+ "(SELECT Name FROM Filename AS f WHERE f.Name = a.Name)";
+#endif /* HAVE_BATCH_FILE_INSERT */
#endif /* HAVE_MYSQL */