summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_crypt.result
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-10-06 13:42:16 +0400
committerpeter@mysql.com <>2002-10-06 13:42:16 +0400
commitd21402052c05e94a0538941fb9f135291bf58b07 (patch)
treeec440e8cca80b5a48de9c9b085968243421b8b8d /mysql-test/r/func_crypt.result
parentde57e9ba3520d2e6a8cf92908af5ef8c43bb6760 (diff)
downloadmariadb-git-d21402052c05e94a0538941fb9f135291bf58b07.tar.gz
One more commit to do the merge of new 4.1 tree
Diffstat (limited to 'mysql-test/r/func_crypt.result')
-rw-r--r--mysql-test/r/func_crypt.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result
index cf464ec21b2..ad3a64ccd1d 100644
--- a/mysql-test/r/func_crypt.result
+++ b/mysql-test/r/func_crypt.result
@@ -1,6 +1,6 @@
select length(encrypt('foo', 'ff')) <> 0;
length(encrypt('foo', 'ff')) <> 0
1
-select password('test'),length(encrypt('test')),encrypt('test','aa');
-password('test') length(encrypt('test')) encrypt('test','aa')
-378b243e220ca493 13 aaqPiZY5xR5l.
+select old_password('test'),length(password("1")),length(encrypt('test')),encrypt('test','aa');
+old_password('test') length(password("1")) length(encrypt('test')) encrypt('test','aa')
+378b243e220ca493 45 13 aaqPiZY5xR5l.