summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-10-03 00:13:08 +0400
committerpeter@mysql.com <>2002-10-03 00:13:08 +0400
commit66b1435ee267cda9e57ad4016094b427b86d06cd (patch)
tree8e50dca8d9f075cbabf3d21fd17e790965353dc4 /sql/item_strfunc.cc
parent4d705988d562cac60d44e22f8d6e76df63432c72 (diff)
parentf1155a98a4b1c4ed11e6f3397c6bae8e3aa5f914 (diff)
downloadmariadb-git-66b1435ee267cda9e57ad4016094b427b86d06cd.tar.gz
Merging...
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 0a0f2462f72..7d4715d507b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1267,7 +1267,9 @@ String *Item_func_password::val_str(String *str)
if (res->length() == 0)
return &empty_string;
make_scrambled_password(tmp_value,res->c_ptr());
- str->set(tmp_value,16,res->charset());
+ printf("Returned to the function\n");
+ str->set(tmp_value,get_password_length(),res->charset());
+ printf("At the exit\n");
return str;
}