summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-03-09 16:52:37 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-03-09 16:52:37 +0400
commita977474a6a1d9e350e6844e72ef9a73d6a119401 (patch)
tree33630f8ce3f1598742dbebac5e98e029904a7be9 /sql
parentfea8903b0cb85bb43502aae43fe8bd2543fccd5c (diff)
downloadmariadb-git-a977474a6a1d9e350e6844e72ef9a73d6a119401.tar.gz
Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY
Diffstat (limited to 'sql')
-rw-r--r--sql/item_strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index b9604cf900b..518b9ca624b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1033,7 +1033,7 @@ void Item_func_substr::fix_length_and_dec()
}
if (arg_count == 3 && args[2]->const_item())
{
- int32 length= (int32) args[2]->val_int() * default_charset_info->mbmaxlen;
+ int32 length= (int32) args[2]->val_int() * collation.collation->mbmaxlen;
if (length <= 0)
max_length=0; /* purecov: inspected */
else