Merge "Bug 11057 - Increase size of ug_group in user_groups table"

diff --combined includes/installer/MysqlUpdater.php
index 7068528,469e9a4..da638de
--- 1/includes/installer/MysqlUpdater.php
--- 2/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@@ -203,10 -203,8 +203,8 @@@ class MysqlUpdater extends DatabaseUpda
                        array( 'addField', 'revision',      'rev_sha1',         'patch-rev_sha1.sql' ),
                        array( 'addField', 'archive',       'ar_sha1',          'patch-ar_sha1.sql' ),
                        array( 'addIndex', 'page', 'page_redirect_namespace_len', 'patch-page_redirect_namespace_len.sql' ),
-                       array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ),
                        array( 'addField',      'uploadstash',  'us_chunk_inx',         'patch-uploadstash_chunk.sql' ),
                        array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
-                       array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ),
  
                        // 1.20
                        array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ),
@@@ -228,6 -226,8 +226,8 @@@
                        array( 'addField', 'job',           'job_attempts',       'patch-job_attempts.sql' ),
                        array( 'doEnableProfiling' ),
                        array( 'addField', 'uploadstash',      'us_props',      'patch-uploadstash-us_props.sql' ),
+                       array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase-255.sql' ),
+                       array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase-255.sql' ),
                );
        }
  
@@@ -240,10 -240,6 +240,10 @@@
         * @param $patchFile String: path to the patch to correct the field
         */
        protected function checkBin( $table, $field, $patchFile ) {
 +              if ( !$this->doTable( $table ) ) {
 +                      return true;
 +              }
 +
                $tableName = $this->db->tableName( $table );
                $res = $this->db->query( "SELECT $field FROM $tableName LIMIT 0", __METHOD__ );
                $flags = explode( ' ', mysql_field_flags( $res->result, 0 ) );
@@@ -264,10 -260,6 +264,10 @@@
         * @return Boolean
         */
        protected function indexHasField( $table, $index, $field ) {
 +              if ( !$this->doTable( $table ) ) {
 +                      return true;
 +              }
 +
                $info = $this->db->indexInfo( $table, $index, __METHOD__ );
                if ( $info ) {
                        foreach ( $info as $row ) {
@@@ -287,10 -279,6 +287,10 @@@
        protected function doInterwikiUpdate() {
                global $IP;
  
 +              if ( !$this->doTable( 'interwiki' ) ) {
 +                      return true;
 +              }
 +
                if ( $this->db->tableExists( "interwiki", __METHOD__ ) ) {
                        $this->output( "...already have interwiki table\n" );
                        return;
@@@ -579,10 -567,6 +579,10 @@@
        }
  
        protected function doUserUniqueUpdate() {
 +              if ( !$this->doTable( 'user' ) ) {
 +                      return true;
 +              }
 +
                $duper = new UserDupes( $this->db, array( $this, 'output' ) );
                if ( $duper->hasUniqueIndex() ) {
                        $this->output( "...already have unique user_name index.\n" );
@@@ -596,10 -580,6 +596,10 @@@
        }
  
        protected function doUserGroupsUpdate() {
 +              if ( !$this->doTable( 'user_groups' ) ) {
 +                      return true;
 +              }
 +
                if ( $this->db->tableExists( 'user_groups', __METHOD__ ) ) {
                        $info = $this->db->fieldInfo( 'user_groups', 'ug_group' );
                        if ( $info->type() == 'int' ) {
@@@ -799,21 -779,12 +799,21 @@@
  
        protected function doEnableProfiling() {
                global $wgProfileToDatabase;
 +
 +              if ( !$this->doTable( 'profiling' ) ) {
 +                      return true;
 +              }
 +
                if ( $wgProfileToDatabase === true && ! $this->db->tableExists( 'profiling', __METHOD__ ) ) {
                        $this->applyPatch( 'patch-profiling.sql', false, 'Add profiling table' );
                }
        }
  
        protected function doMaybeProfilingMemoryUpdate() {
 +              if ( !$this->doTable( 'profiling' ) ) {
 +                      return true;
 +              }
 +
                if ( !$this->db->tableExists( 'profiling', __METHOD__ ) ) {
                        return true;
                } elseif ( $this->db->fieldExists( 'profiling', 'pf_memory', __METHOD__ ) ) {
@@@ -885,10 -856,6 +885,10 @@@
        }
  
        protected function doUserNewTalkTimestampNotNull() {
 +              if ( !$this->doTable( 'user_newtalk' ) ) {
 +                      return true;
 +              }
 +
                $info = $this->db->fieldInfo( 'user_newtalk', 'user_last_timestamp' );
                if ( $info === false ) {
                        return;