diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-10 10:31:33 +0300 |
| commit | dadf8207438b91fb93f2d16d09d55f9d69cce3c9 (patch) | |
| tree | b118b585c21710f0fef58c3d009fdd39a4578791 /sql/field.cc | |
| parent | 516b39c68305afc720d26ab5011ec5c30f9dcbe8 (diff) | |
| parent | 411a6bfeb94e89f4cd4b8daaee96fe1913218a85 (diff) | |
| download | mariadb-git-dadf8207438b91fb93f2d16d09d55f9d69cce3c9.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 19b0ee8ec7e..dc32624db10 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6669,9 +6669,8 @@ int Field_string::cmp(const uchar *a_ptr, const uchar *b_ptr) void Field_string::sort_string(uchar *to,uint length) { - IF_DBUG(uint tmp=) my_strnxfrm(field_charset, - to, length, - ptr, field_length); + uint tmp __attribute__((unused))= + my_strnxfrm(field_charset, to, length, ptr, field_length); DBUG_ASSERT(tmp == length); } |