From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 23 Mar 2026 18:29:38 +0000 (-0400)
Subject: [#4373] Capture select output in procedure
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dde017adb4ee6aefe65b7ed41375f4c3f4e6fdf8;p=thirdparty%2Fkea.git

[#4373] Capture select output in procedure

modified:   src/share/database/scripts/mysql/dhcpdb_create.mysql
modified:   src/share/database/scripts/mysql/upgrade_033_to_034.sh.in
---

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 389d9f820e..7709f4273a 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -6807,6 +6807,7 @@ CREATE PROCEDURE sflqCreateFlqPool6(IN p_start_address VARCHAR(45),
 BEGIN
     DECLARE bin_next_address BINARY(16);
     DECLARE bin_end_address BINARY(16);
+    DECLARE lease_address VARCHAR(45);
 
     START TRANSACTION;
 
@@ -6839,7 +6840,7 @@ BEGIN
     -- to increment the address/prefix.
     WHILE bin_next_address <= bin_end_address
     DO
-        SELECT address FROM lease6
+        SELECT address INTO lease_address FROM lease6
             WHERE (address = bin_next_address AND lease6.state != 2
                    AND (expire > now() OR valid_lifetime = 0xFFFFFFFF));
 
diff --git a/src/share/database/scripts/mysql/upgrade_033_to_034.sh.in b/src/share/database/scripts/mysql/upgrade_033_to_034.sh.in
index 7a3074848a..76475a4348 100755
--- a/src/share/database/scripts/mysql/upgrade_033_to_034.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_033_to_034.sh.in
@@ -387,6 +387,7 @@ CREATE PROCEDURE sflqCreateFlqPool6(IN p_start_address VARCHAR(45),
 BEGIN
     DECLARE bin_next_address BINARY(16);
     DECLARE bin_end_address BINARY(16);
+    DECLARE lease_address VARCHAR(45);
 
     START TRANSACTION;
 
@@ -419,7 +420,7 @@ BEGIN
     -- to increment the address/prefix.
     WHILE bin_next_address <= bin_end_address
     DO
-        SELECT address FROM lease6
+        SELECT address INTO lease_address FROM lease6
             WHERE (address = bin_next_address AND lease6.state != 2
                    AND (expire > now() OR valid_lifetime = 0xFFFFFFFF));