diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-06-05 15:53:39 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-06-05 15:53:39 +0200 |
| commit | 0a8ae683297e494703c50d362e211d3ed1f3f5c3 (patch) | |
| tree | 152347ad9b9635312bdc1a9d9317f7ad10fd7573 | |
| parent | 08f360703f52f451a5985acb8411140adbff6105 (diff) | |
| download | mariadb-git-0a8ae683297e494703c50d362e211d3ed1f3f5c3.tar.gz | |
Bug#14051002 VALGRIND: CONDITIONAL JUMP OR MOVE IN RR_CMP / MY_QSORT
Patch for 5.1 and 5.5: fix typo in byte comparison in rr_cmp()
| -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 e275db83c93..da876f7554c 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -631,7 +631,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]; |