Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.19.2.1
diff -u -r1.19.2.1 path.inc
--- includes/path.inc	13 Oct 2008 21:06:41 -0000	1.19.2.1
+++ includes/path.inc	10 Mar 2009 16:59:26 -0000
@@ -66,7 +66,7 @@
         return $map[$path_language][$path];
       }
       // Get the most fitting result falling back with alias without language
-      $alias = db_result(db_query("SELECT dst FROM {url_alias} WHERE src = '%s' AND language IN('%s', '') ORDER BY language DESC", $path, $path_language));
+      $alias = db_result(db_query("SELECT dst FROM {url_alias} WHERE src = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language));
       $map[$path_language][$path] = $alias;
       return $alias;
     }
@@ -77,7 +77,7 @@
       $src = '';
       if (!isset($map[$path_language]) || !($src = array_search($path, $map[$path_language]))) {
         // Get the most fitting result falling back with alias without language
-        if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC", $path, $path_language))) {
+        if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language))) {
           $map[$path_language][$src] = $path;
         }
         else {
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.238.2.12
diff -u -r1.238.2.12 system.install
--- modules/system/system.install	25 Feb 2009 14:02:46 -0000	1.238.2.12
+++ modules/system/system.install	10 Mar 2009 17:08:12 -0000
@@ -1093,10 +1093,14 @@
         'not null' => TRUE,
         'default' => '')
       ),
-    'unique keys' => array('dst_language' => array('dst', 'language')),
+    'unique keys' => array(
+      'dst_language_pid' => array('dst', 'language', 'pid'),
+    ),
     'primary key' => array('pid'),
-    'indexes' => array('src_language' => array('src', 'language')),
-    );
+    'indexes' => array(
+      'src_language_pid' => array('src', 'language', 'pid'),
+    ),
+  );
 
   return $schema;
 }
@@ -2548,6 +2552,19 @@
 }
 
 /**
+ * Add pid column to {url_alias} indexes.
+ */
+function system_update_6050() {
+  $ret = array();
+  db_drop_index($ret, 'url_alias', 'dst_language');
+  db_drop_index($ret, 'url_alias', 'src_language');
+  db_add_index($ret, 'url_alias', 'dst_language_pid', array('dst', 'language', 'pid'));
+  db_add_index($ret, 'url_alias', 'src_language_pid', array('src', 'language', 'pid'));
+  return $ret;
+}
+
+
+/**
  * @} End of "defgroup updates-5.x-to-6.x"
  * The next series of updates should start at 7000.
  */