merged fix for 5426

diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml
index f72526036deceaea8a5c3a7e4f8bbcae9bfd66f0..c802452b4eed81601daf83d9c491dd87cbbffde0 100755 (executable)
--- a/lib/db/migrate2utf8.xml
+++ b/lib/db/migrate2utf8.xml
@@ -362,7 +362,7 @@
             migrate2utf8_course_fullname(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(15))">
+        <FIELD name="shortname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="shortname" addindex="shortname(shortname(100))">
           <PHP_FUNCTION>
             migrate2utf8_course_shortname(RECORDID)
           </PHP_FUNCTION>
@@ -426,12 +426,12 @@
             migrate2utf8_user_idnumber(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(20))">
+        <FIELD name="firstname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_firstname" addindex="user_firstname(firstname(100))">
           <PHP_FUNCTION>
             migrate2utf8_user_firstname(RECORDID)
           </PHP_FUNCTION>
         </FIELD>
-        <FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(20))">
+        <FIELD name="lastname" method="PHP_FUNCTION" type="varchar" length="100" dropindex="user_lastname" addindex="user_lastname(lastname(100))">
           <PHP_FUNCTION>
             migrate2utf8_user_lastname(RECORDID)
           </PHP_FUNCTION>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 206ffe88a639bef3a86256b7a1c30d700d02a44d..f04473808896224887c5d573b2ff0b4b9637138f 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1921,6 +1921,28 @@ function main_upgrade($oldversion=0) {
         table_column('user','url','url','varchar','255','','','not null');
     }
     
+    
+    if ($oldversion < 2006050400) {
+
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_deleted_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_confirmed_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_firstname_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastname_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_city_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_country_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_lastaccess_idx;",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` DROP INDEX {$CFG->prefix}user_email_idx;",false);
+
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_deleted (deleted)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_confirmed (confirmed)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_firstname (firstname)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastname (lastname)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_city (city)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_country (country)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_lastaccess (lastaccess)",false);
+        execute_sql("ALTER TABLE `{$CFG->prefix}user` ADD INDEX user_email (email)",false);
+    }
+    
     return $result;
 }
 

diff --git a/version.php b/version.php
index 64eb018df8d8838df197fb3ba5a72898175c38b9..842f4da90d3027c90b397a0c28065c5cb2ba4941 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006050300;  // YYYYMMDD = date
+   $version = 2006050400;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name