diff --git a/0047-rename-_get_result_by_index.patch b/0047-rename-_get_result_by_index.patch new file mode 100644 index 0000000000000000000000000000000000000000..5906414022665b345d3604be4205fb03a3cc60d2 --- /dev/null +++ b/0047-rename-_get_result_by_index.patch @@ -0,0 +1,34 @@ +From 8e0923b62269429e6e00c14c8da464b53b3cc60f Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Wed, 12 Jun 2024 10:21:26 +0800 +Subject: [PATCH] rename _get_result_by_index + +--- + src/database/pgsql_common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/pgsql_common.c b/src/database/pgsql_common.c +index afd8c23..ce574f1 100755 +--- a/src/database/pgsql_common.c ++++ b/src/database/pgsql_common.c +@@ -157,7 +157,7 @@ static void _destroy_db_key(void *arg) + } + + /* NOTE: Ensure that pgsql_conn->lock is set on function entry */ +-static void _get_result_by_index(SQLHSTMT stmt, int index) ++static void _navigate_result_by_index(SQLHSTMT stmt, int index) + { + SQLRETURN rc = 0; + int i = 1; // already at first result +@@ -1196,7 +1196,7 @@ extern pgsql_res_t* pgsql_db_query_ret(pgsql_conn_t *pgsql_conn, + + if (SLURM_SUCCESS == _pgsql_query_internal(pgsql_conn->db_conn, query, result->stmt, (SQLCHAR*)(result->state))) { + +- _get_result_by_index(result->stmt, index+1); ++ _navigate_result_by_index(result->stmt, index+1); + + SQLNumResultCols(result->stmt, &result->sNumCols); + SQLRETURN rc = SQLRowCount(result->stmt, &result->sNumRows); +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 208b4cafb2b6f52067c76605974851ab84d49c5a..e2fc6813591c46326a6fe3c93819cff3b2d3e579 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 49 +%define rel 50 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -62,6 +62,7 @@ Patch43: 0043-Remove-redundant-tres_table-fields.patch Patch44: 0044-replace-goto-fini.patch Patch45: 0045-Remove-comments-in-concatenated-strings.patch Patch46: 0046-Add-empty-check-and-inline-in-set_autocommit_off.patch +Patch47: 0047-rename-_get_result_by_index.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -754,6 +755,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Jun 12 2024 Xing Liu - 21.08.8-50 +- rename _get_result_by_index + * Tue Jun 11 2024 Xing Liu - 21.08.8-49 - Add empty check and inline in set_autocommit_off