diff options
| author | Sergei Golubchik <serg@mysql.com> | 2009-10-30 19:13:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2009-10-30 19:13:58 +0100 |
| commit | 6eaf0b5acb272698967f702f7ecec120571578c9 (patch) | |
| tree | 53d531c0319fefc2db3ea6c70ceb4648c3cb4ed9 /sql/field.cc | |
| parent | 96f31b3637589587bbc343a76dbc686441ac4b16 (diff) | |
| download | mariadb-git-6eaf0b5acb272698967f702f7ecec120571578c9.tar.gz | |
backport of dbug extensions from 6.0:
function/ syntax
glob(7) wildcards
unit tests
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 65965c925d2..0cd01685744 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6729,9 +6729,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); } |