From dd4f5dfb7c8b3c53a0a4caed0f4616e13adfe054 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 3 Dec 2008 00:04:52 +0000
Subject: [PATCH] svn merge -r15808:15810
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
src/common/slurm_accounting_storage.c | 1 +
src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index 631ad9653f4..94451cf82da 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -1854,6 +1854,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
*object = object_ptr;
init_acct_association_rec(object_ptr);
+
if (rpc_version >= 4) {
safe_unpack32(&count, buffer);
if(count != NO_VAL) {
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index 997bba822b4..f2affc0f4c5 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -1138,6 +1138,7 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
char *block_id = NULL;
char *query = NULL;
int reinit = 0;
+ char *wckey = NULL;
if (!job_ptr->details || !job_ptr->details->submit_time) {
error("jobacct_storage_p_job_start: "
--
GitLab