Merged branch wip-MDL-30521 with conflict resolutions
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 21:32:08 +0000 (10:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 21:32:08 +0000 (10:32 +1300)
1  2 
lib/db/upgrade.php
version.php

@@@ -145,6 -145,18 +145,18 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2012020200.06);
      }
  
 -    if ($oldversion < 2012021300.01) {
++    if ($oldversion < 2012021700.01) {
+         // Changing precision of field uniquehash on table post to 255
+         $table = new xmldb_table('post');
+         $field = new xmldb_field('uniquehash', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'content');
+         // Launch change of precision for field uniquehash
+         $dbman->change_field_precision($table, $field);
+         // Main savepoint reached
 -        upgrade_main_savepoint(true, 2012021300.01);
++        upgrade_main_savepoint(true, 2012021700.01);
+     }
      return true;
  }
  
diff --cc version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2012021700.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2012021300.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2012021700.01;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes