summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_crypt.result
diff options
context:
space:
mode:
authorevgen@sunlight.local <>2006-08-01 09:24:19 +0400
committerevgen@sunlight.local <>2006-08-01 09:24:19 +0400
commitdda7a95c59dcaa87dc58c1db8b86245494652609 (patch)
tree175eff6178bdfc623e26353bfcc955d7997c6025 /mysql-test/r/func_crypt.result
parent799ecc9f2abeb19db7d2409ac756f627b25b75a3 (diff)
parent6056f7714e0d86b34d87048315b0fc03a8c03f61 (diff)
downloadmariadb-git-dda7a95c59dcaa87dc58c1db8b86245494652609.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
Diffstat (limited to 'mysql-test/r/func_crypt.result')
-rw-r--r--mysql-test/r/func_crypt.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result
index afdec0f4d06..32377c9ba63 100644
--- a/mysql-test/r/func_crypt.result
+++ b/mysql-test/r/func_crypt.result
@@ -88,8 +88,8 @@ select old_password(' i d k f a ');
old_password(' i d k f a ')
5c078dc54ca0fcca
explain extended select password('idkfa '), old_password('idkfa');
-id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
+id select_type table type possible_keys key key_len ref rows filtered Extra
+1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1003 select password(_latin1'idkfa ') AS `password('idkfa ')`,old_password(_latin1'idkfa') AS `old_password('idkfa')`
select encrypt('1234','_.');