summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 12:29:31 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 12:29:31 +0200
commitd833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch)
treed1271339e1c3a660e4788a5c9913bfe54e0271f1 /sql/item_func.cc
parente431d90065d277e62fa4f81a1654790f58a84146 (diff)
parent76577e1e2602f3c30859a176808c433a263e1b0a (diff)
downloadmariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 458db430222..002eef67667 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -594,6 +594,7 @@ my_decimal *Item_real_func::val_decimal(my_decimal *decimal_value)
}
+#ifdef HAVE_DLOPEN
void Item_udf_func::fix_num_length_and_dec()
{
uint fl_length= 0;
@@ -610,6 +611,7 @@ void Item_udf_func::fix_num_length_and_dec()
max_length= float_length(NOT_FIXED_DEC);
}
}
+#endif
/**