Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-34933_24_STABLE' of https://github.com/mchurchward/…

…moodle into MOODLE_24_STABLE

Conflicts:
	lib/db/upgrade.php
	version.php
  • Loading branch information...
commit 9723842bc013aa55f4349d3f338299536720dd53 2 parents 22687af + d75a987
@damyon damyon authored
Showing with 18 additions and 1 deletion.
  1. +3 −0  lib/db/install.xml
  2. +14 −0 lib/db/upgrade.php
  3. +1 −1  version.php
View
3  lib/db/install.xml
@@ -2363,6 +2363,9 @@
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
</KEYS>
+ <INDEXES>
+ <INDEX NAME="unreadmessageid_idx" UNIQUE="false" FIELDS="unreadmessageid" COMMENT="Index on unreadmessage id"/>
+ </INDEXES>
</TABLE>
<TABLE NAME="files" COMMENT="description of files, content is stored in sha1 file pool" PREVIOUS="message_working" NEXT="files_reference">
<FIELDS>
View
14 lib/db/upgrade.php
@@ -1705,5 +1705,19 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012120303.08);
}
+ if ($oldversion < 2012120303.09) {
+ // Adding index to unreadmessageid field of message_working table (MDL-34933)
+ $table = new xmldb_table('message_working');
+ $index = new xmldb_index('unreadmessageid_idx', XMLDB_INDEX_NOTUNIQUE, array('unreadmessageid'));
+
+ // Conditionally launch add index unreadmessageid
+ if (!$dbman->index_exists($table, $index)) {
+ $dbman->add_index($table, $index);
+ }
+
+ // Main savepoint reached.
+ upgrade_main_savepoint(true, 2012120303.09);
+ }
+
return true;
}
View
2  version.php
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2012120303.08; // 20121203 = branching date YYYYMMDD - do not modify!
+$version = 2012120303.09; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
Please sign in to comment.
Something went wrong with that request. Please try again.