diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
commit | 557f0d3ad04111e274d709de5fd9879961772210 (patch) | |
tree | d7d1767519b4631349ca244a988478f808163919 /sql/records.cc | |
parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
parent | 27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff) | |
download | mariadb-git-557f0d3ad04111e274d709de5fd9879961772210.tar.gz |
5.2->5.3 merge
Diffstat (limited to 'sql/records.cc')
-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 b125c201621..400287ec57c 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -626,7 +626,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]; |