summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_crypt.test
diff options
context:
space:
mode:
authorunknown <peter@mysql.com>2002-10-06 13:42:16 +0400
committerunknown <peter@mysql.com>2002-10-06 13:42:16 +0400
commit8640cd354413508b698817dce787827c370e7b9a (patch)
treeec440e8cca80b5a48de9c9b085968243421b8b8d /mysql-test/t/func_crypt.test
parent748191fd807d6f380b48b9331a8d8cf333d2bb45 (diff)
downloadmariadb-git-8640cd354413508b698817dce787827c370e7b9a.tar.gz
One more commit to do the merge of new 4.1 tree
client/mysqladmin.c: Handle new password.c prototypes include/mysql_com.h: New prototypes libmysql/Makefile.shared: Client need sha1 compiled in now libmysql/password.c: Replace copy with symlink mysql-test/r/func_crypt.result: Fix test results to handle new password function mysql-test/t/func_crypt.test: New tests for new password function sql/item_create.cc: add old_password() function sql/item_create.h: add old_password() function sql/item_strfunc.cc: add old_password() function changes to new password.c functions prototypes sql/item_strfunc.h: add old_password function handle new prototypes sql/lex.h: add OLD_PASSWORD function sql/password.c: Continue to work on new password handling sql/sql_acl.cc: Handle new passwords sql/sql_yacc.yy: Changes for new prototypes
Diffstat (limited to 'mysql-test/t/func_crypt.test')
-rw-r--r--mysql-test/t/func_crypt.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test
index f01504d3691..812bdade39f 100644
--- a/mysql-test/t/func_crypt.test
+++ b/mysql-test/t/func_crypt.test
@@ -1,3 +1,3 @@
select length(encrypt('foo', 'ff')) <> 0;
--replace_result $1$aa$4OSUA5cjdx0RUQ08opV27/ aaqPiZY5xR5l.
-select password('test'),length(encrypt('test')),encrypt('test','aa');
+select old_password('test'),length(password("1")),length(encrypt('test')),encrypt('test','aa');