Index: modules/locale/locale.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v
retrieving revision 1.14
diff -u -p -r1.14 locale.install
--- modules/locale/locale.install	17 Jun 2007 17:41:40 -0000	1.14
+++ modules/locale/locale.install	23 Jun 2007 08:25:46 -0000
@@ -110,6 +110,22 @@ function locale_update_6004() {
 }
 
 /**
+ * Fix missing locale -> language column rename update from locale_update_6001().
+ */
+function locale_update_6005() {
+  $ret = array();
+  $ismysql = in_array($GLOBALS['db_type'], array('mysql', 'mysqli'));
+  if ($ismysql) {
+      db_drop_index($ret, 'locales_target', 'lang');
+  }
+  db_change_field($ret, 'locales_target', 'locale', 'language', array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''));
+  if ($ismysql) {
+    db_add_index($ret, 'locales_target', 'language', array('language'));
+  }
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-5.x-to-6.x"
  */
 
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.122
diff -u -p -r1.122 system.install
--- modules/system/system.install	15 Jun 2007 18:40:14 -0000	1.122
+++ modules/system/system.install	23 Jun 2007 08:25:48 -0000
@@ -3251,12 +3251,6 @@ function system_update_6019() {
         db_add_index($ret, 'comments', 'nid', array('nid'));
       }
 
-      // Rename index 'lang' to 'language'.
-      if (db_table_exists('locales_target')) {
-        db_drop_index($ret, 'locales_target', 'lang');
-        db_add_index($ret, 'locales_target', 'language', array('language'));
-      }
-
       // Change to size => small.
       db_update_field($ret, 'cache', 'serialized');
       db_update_field($ret, 'cache_filter', 'serialized');