From 2190bacdf2ab20968ef6b4e0c827d4e60b1764a7 Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Tue, 28 Nov 2017 09:49:27 -0700
Subject: [PATCH] Fix to handle situation during upgrade where there were no
 reservations.

Fix regression added in commit 9df820912227.

Bug 4406.
---
 src/plugins/accounting_storage/mysql/as_mysql_convert.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/accounting_storage/mysql/as_mysql_convert.c b/src/plugins/accounting_storage/mysql/as_mysql_convert.c
index 129cf6124e4..f5cd5b30c4b 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_convert.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_convert.c
@@ -441,6 +441,9 @@ static int _update_unused_wall(mysql_conn_t *mysql_conn,
 			   curr_resv_id, curr_resv_start);
 	}
 
+	if (!query)
+		return rc;
+
 	if (debug_flags & DEBUG_FLAG_DB_QUERY)
 		DB_DEBUG(mysql_conn->conn, "query\n%s", query);
 
-- 
GitLab