From 0f77b186f197878e5b324c445b2ef50b84dc792d Mon Sep 17 00:00:00 2001 From: stronk7 Date: Fri, 18 Apr 2008 23:15:44 +0000 Subject: [PATCH] Fix double savepoint in the same block of upgrade. MDL-11888 --- lib/db/upgrade.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 09d6ba49c5..9c7fad1149 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2960,9 +2960,6 @@ function xmldb_main_upgrade($oldversion=0) { /// Launch drop index contextid-lowerboundary $result = $result && drop_index($table, $index); - /// Main savepoint reached - upgrade_main_savepoint($result, 2008030700); - /// Define index contextid-lowerboundary-letter (unique) to be added to grade_letters $table = new XMLDBTable('grade_letters'); $index = new XMLDBIndex('contextid-lowerboundary-letter'); @@ -2972,8 +2969,8 @@ function xmldb_main_upgrade($oldversion=0) { $result = $result && add_index($table, $index); /// Main savepoint reached - upgrade_main_savepoint($result, 2008030700); - } + upgrade_main_savepoint($result, 2008030700); + } return $result; } -- 2.39.5