summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 5f1e0541ffb..5d4dbe9a416 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -6297,12 +6297,10 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr)
void Field_string::sort_string(char *to,uint length)
{
-#ifndef DBUG_OFF
- uint tmp= my_strnxfrm(field_charset,
- (uchar*) to, length,
- (uchar*) ptr, field_length);
+ IF_DBUG(uint tmp=) my_strnxfrm(field_charset,
+ (uchar*) to, length,
+ (uchar*) ptr, field_length);
DBUG_ASSERT(tmp == length);
-#endif
}