bzr push into mysql-5.5 branch (tor.didriksen:3862 to 3863)

[Tor Didriksen]

 3863 Tor Didriksen	2012-06-05 [merge]
      merge 5.1 => 5.5

    modified:
      sql/records.cc
 3862 Tor Didriksen	2012-06-05
      Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED
      
      Followup patch: wrong result unless archive storage engine is available.

    modified:
      mysql-test/suite/perfschema/t/query_cache.test
=== modified file 'sql/records.cc'
--- a/sql/records.cc	2011-06-30 15:46:53 +0000
+++ b/sql/records.cc	2012-06-05 14:12:22 +0000
@@ -690,7 +690,7 @@ static int rr_cmp(uchar *a,uchar *b)
   if (a[4] != b[4])
     return (int) a[4] - (int) b[4];
   if (a[5] != b[5])
-    return (int) a[1] - (int) b[5];
+    return (int) a[5] - (int) b[5];
   if (a[6] != b[6])
     return (int) a[6] - (int) b[6];
   return (int) a[7] - (int) b[7];

No bundle (reason: useless for push emails).