[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] git: Bacula branch, master,
From: "Eric Bollengier" <ricozz () users ! sourceforge ! net>
Date: 2009-11-11 14:11:16
Message-ID: E1N8Duq-00015e-GI () 9j8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".
The branch, master has been updated
via 29b058569bee5773c1d9a9852ca3b6db6f45c81b (commit)
via 146559de638eda9be5295536f971a61e4f275eaa (commit)
via 0ad42e9e66214c6d89e862e90aa05fb915546494 (commit)
via 6b2146616d3eab7c73620de06582b7395e459403 (commit)
via 933a3404532463eae9de3b1dc574de5c8651e0bd (commit)
via 9cdde920b381926f78992796aa74d4a0b0a90c7b (commit)
from d51ddc22cbd9e40d846bdcf5bee8203abe68fe61 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29b058569bee5773c1d9a9852ca3b6db6f45c81b
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 15:10:51 2009 +0100
Fix base-job-test with Mysql
commit 146559de638eda9be5295536f971a61e4f275eaa
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 14:44:26 2009 +0100
small cleanup
commit 0ad42e9e66214c6d89e862e90aa05fb915546494
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 14:43:21 2009 +0100
Remove extra _ of _dbg_print_db func
commit 6b2146616d3eab7c73620de06582b7395e459403
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 13:40:03 2009 +0100
Tweak base file query for Mysql 4.1
commit 933a3404532463eae9de3b1dc574de5c8651e0bd
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 12:26:56 2009 +0100
Update BDATE
commit 9cdde920b381926f78992796aa74d4a0b0a90c7b
Author: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed Nov 11 12:25:52 2009 +0100
fix segfault on redhat4
-----------------------------------------------------------------------
Summary of changes:
diff --git a/bacula/src/cats/protos.h b/bacula/src/cats/protos.h
index e8726ba..7f73c7b 100644
--- a/bacula/src/cats/protos.h
+++ b/bacula/src/cats/protos.h
@@ -59,7 +59,7 @@ void db_end_transaction(JCR *jcr, B_DB *mdb);
int db_int64_handler(void *ctx, int num_fields, char **row);
int db_list_handler(void *ctx, int num_fields, char **row);
void db_thread_cleanup();
-void _dbg_print_db(JCR *jcr, FILE *fp);
+void dbg_print_db(JCR *jcr, FILE *fp);
int db_int_handler(void *ctx, int num_fields, char **row);
/* sql_create.c */
diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index f058d83..8421962 100644
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -190,13 +190,15 @@ bool db_check_max_connections(JCR *jcr, B_DB *mdb, uint32_t max_concurrent_jobs)
#endif
/* Check max_connections setting */
- if (!db_sql_query(mdb, sql_get_max_connections[db_type], db_max_connections_handler, &max_conn)) {
+ if (!db_sql_query(mdb, sql_get_max_connections[db_type],
+ db_max_connections_handler, &max_conn)) {
Jmsg(jcr, M_ERROR, 0, "Can't verify max_connections settings %s", mdb->errmsg);
return ret;
}
if (max_conn && max_concurrent_jobs && max_concurrent_jobs > max_conn) {
Mmsg(mdb->errmsg,
- _("On db_name=%s, %s max_connections=%d is lower than Director MaxConcurentJobs=%d\n"),
+ _("On db_name=%s, %s max_connections=%d is lower than Director "
+ "MaxConcurentJobs=%d\n"),
mdb->db_name, db_get_type(), max_conn, max_concurrent_jobs);
Jmsg(jcr, M_WARNING, 0, "%s", mdb->errmsg);
ret = false;
@@ -824,7 +826,7 @@ bool db_open_batch_connexion(JCR *jcr, B_DB *mdb)
* ie, after a fatal signal and before exiting the program
* Print information about a B_DB object.
*/
-void _dbg_print_db(JCR *jcr, FILE *fp)
+void dbg_print_db(JCR *jcr, FILE *fp)
{
B_DB *mdb = jcr->db;
diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index 5f36968..9dd7a2b 100644
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -469,7 +469,7 @@ const char *select_recent_version_with_basejob[4] = {
"FROM ( "
"SELECT JobTDate, PathId, FilenameId " /* Get all normal files */
"FROM File JOIN Job USING (JobId) " /* from selected backup */
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"UNION ALL "
"SELECT JobTDate, PathId, FilenameId " /* Get all files from */
"FROM BaseFiles " /* BaseJob */
@@ -508,7 +508,7 @@ const char *select_recent_version_with_basejob[4] = {
"FROM ( "
"SELECT JobTDate, PathId, FilenameId "
"FROM File JOIN Job USING (JobId) "
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"UNION ALL "
"SELECT JobTDate, PathId, FilenameId "
"FROM BaseFiles "
@@ -533,7 +533,7 @@ const char *select_recent_version_with_basejob[4] = {
"FROM ( "
"SELECT JobTDate, PathId, FilenameId "
"FROM File JOIN Job USING (JobId) "
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"UNION ALL "
"SELECT JobTDate, PathId, FilenameId "
"FROM BaseFiles "
@@ -560,7 +560,7 @@ const char *select_recent_version[4] = {
"FROM ( " /* Choose the last version for each Path/Filename */
"SELECT max(JobTDate) AS JobTDate, PathId, FilenameId "
"FROM File JOIN Job USING (JobId) "
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"GROUP BY PathId, FilenameId "
") AS t1, Job AS j1, File AS f1 "
"WHERE t1.JobTDate = j1.JobTDate "
@@ -583,7 +583,7 @@ const char *select_recent_version[4] = {
"FROM ( "
"SELECT max(JobTDate) AS JobTDate, PathId, FilenameId "
"FROM File JOIN Job USING (JobId) "
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"GROUP BY PathId, FilenameId "
") AS t1, Job AS j1, File AS f1 "
"WHERE t1.JobTDate = j1.JobTDate "
@@ -599,7 +599,7 @@ const char *select_recent_version[4] = {
"FROM ( "
"SELECT max(JobTDate) AS JobTDate, PathId, FilenameId "
"FROM File JOIN Job USING (JobId) "
- "WHERE JobId IN (%s) "
+ "WHERE File.JobId IN (%s) "
"GROUP BY PathId, FilenameId "
") AS t1, Job AS j1, File AS f1 "
"WHERE t1.JobTDate = j1.JobTDate "
diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 39f0fb3..60fa3b1 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -1206,7 +1206,7 @@ bool db_commit_base_file_attributes_record(JCR *jcr, B_DB *mdb)
"AND A.Name = B.Name "
"ORDER BY B.FileId",
edit_uint64(jcr->JobId, ed1), ed1, ed1);
- ret = QUERY_DB(jcr, mdb, mdb->cmd);
+ ret = db_sql_query(mdb, mdb->cmd, NULL, NULL);
jcr->nb_base_files_used = sql_affected_rows(mdb);
db_cleanup_base_file(jcr, mdb);
diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 55d9818..35ef7db 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -1105,7 +1105,7 @@ bool db_get_used_base_jobids(JCR *jcr, B_DB *mdb,
"SELECT DISTINCT BaseJobId "
" FROM Job JOIN BaseFiles USING (JobId) "
" WHERE Job.HasBase = 1 "
- " AND JobId IN (%s) ", jobids);
+ " AND Job.JobId IN (%s) ", jobids);
return db_sql_query(mdb, buf.c_str(), db_list_handler, result);
}
@@ -1224,9 +1224,9 @@ bool db_get_base_file_list(JCR *jcr, B_DB *mdb,
bool db_get_base_jobid(JCR *jcr, B_DB *mdb, JOB_DBR *jr, JobId_t *jobid)
{
+ POOL_MEM query(PM_FNAME);
char date[MAX_TIME_LENGTH];
int64_t id = *jobid = 0;
- POOL_MEM query(PM_FNAME);
// char clientid[50], filesetid[50];
diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 7299950..2e3a4c7 100644
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -329,7 +329,7 @@ int main (int argc, char *argv[])
init_job_server(director->MaxConcurrentJobs);
- dbg_jcr_add_hook(_dbg_print_db); /* used to debug B_DB connexion after fatal signal */
+ dbg_jcr_add_hook(dbg_print_db); /* used to debug B_DB connexion after fatal signal */
// init_device_resources();
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 183eaa2..a51326c 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
#undef VERSION
#define VERSION "3.1.4"
-#define BDATE "1 November 2009"
-#define LSMDATE "01Nov09"
+#define BDATE "11 November 2009"
+#define LSMDATE "11Nov09"
#define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
#define BYEAR "2009" /* year for copyright messages in progs */
hooks/post-receive
--
Bacula
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic