merge 5.1 => 5.5

22b9ca0a · Tor Didriksen · 25383ff6 · 0a8ae683 · 22b9ca0a
Commit 22b9ca0a authored Jun 05, 2012 by Tor Didriksen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/records.cc sql/records.cc +1 -1

No files found.
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -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];