summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2022-01-27 21:44:45 +0200
committerMonty <monty@mariadb.org>2022-01-27 21:44:45 +0200
commit24c51be6fe66d65e711af210ca4ba26c9cbabe53 (patch)
tree6f68e6f061759ed474aa4e031c8808368f9a1649
parente99d3da6381023395c86f679bb76b00b4385dc2d (diff)
downloadmariadb-git-24c51be6fe66d65e711af210ca4ba26c9cbabe53.tar.gz
Fixed compilation error if HAVE_CRYPT is not defined
-rw-r--r--sql/item_strfunc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index e5935178f10..7fa3fb0b4b6 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2203,9 +2203,10 @@ char *Item_func_password::alloc(THD *thd, const char *password,
String *Item_func_encrypt::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);
- String *res =args[0]->val_str(str);
#ifdef HAVE_CRYPT
+ String *res =args[0]->val_str(str);
+
char salt[3],*salt_ptr;
if ((null_value=args[0]->null_value))
return 0;