summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-12 16:47:14 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-12 16:47:14 +0100
commit27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (patch)
tree793f6a4bbb8edbc49c12ffb28526ce7f885ca3bb /sql
parent755cd443f95f8e6d064b18af3fb0c496b82abfe7 (diff)
parent5c7aa5f2ae533d395b4c7460d8a388b6326a5add (diff)
downloadmariadb-git-27095a24f6cb0e8c859c1a3f76050e6b5a6434c6.tar.gz
5.1 merge
Diffstat (limited to 'sql')
-rw-r--r--sql/records.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc
index bdb27322a28..7284ca6ca26 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -627,7 +627,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];