Merge branch 'MDL-87406-main' of https://github.com/ericmerrill/moodle

public/lib/db/upgrade.php

@@ -1490,7 +1490,7 @@ function xmldb_main_upgrade($oldversion) {
                   FROM {customfield_data} d
                   JOIN {customfield_field} f ON d.fieldid = f.id
                   JOIN {customfield_category} c ON f.categoryid = c.id";
-        $records = $DB->get_records_sql($sql);
+        $records = $DB->get_recordset_sql($sql);
 
         foreach ($records as $r) {
             $DB->update_record('customfield_data', (object)[
@@ -1501,6 +1501,8 @@ function xmldb_main_upgrade($oldversion) {
             ]);
         }
 
+        $records->close();
+
         // Define table customfield_shared to be created.
         $table = new xmldb_table('customfield_shared');