diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-06-05 16:12:22 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-06-05 16:12:22 +0200 |
| commit | 22b9ca0af09775f520d440b57afce7df289a12be (patch) | |
| tree | 4cd2ab29a9a97826222be51079d2e980b4f24278 /sql | |
| parent | 25383ff615162aaff8ffbd2fde3c87e4cb694727 (diff) | |
| parent | 0a8ae683297e494703c50d362e211d3ed1f3f5c3 (diff) | |
| download | mariadb-git-22b9ca0af09775f520d440b57afce7df289a12be.tar.gz | |
merge 5.1 => 5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/records.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc index 2274b1b5699..55859e05f29 100644 --- 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]; |