summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_des_encrypt.result
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-07-07 11:49:44 -0700
committerunknown <jimw@mysql.com>2005-07-07 11:49:44 -0700
commit01b66f3f346a7f2a30806c270a1d0945cc27992e (patch)
treed8301fe302fcd95d93e57744293525f627d870b5 /mysql-test/r/func_des_encrypt.result
parent0f06342304519f5b3c5e43045dca2a2b03ff1dc0 (diff)
downloadmariadb-git-01b66f3f346a7f2a30806c270a1d0945cc27992e.tar.gz
Fix crash caused by calling DES_ENCRYPT() without the --des-key-file
option having been passed to the server. (Bug #11643) sql/des_key_file.cc: Split initialization of mutex to new function, and make sure static initialization variable is initialized. sql/item_strfunc.cc: Make sure to initialize mutex before using it sql/mysql_priv.h: Add init_des_key_file() declaration mysql-test/r/func_des_encrypt.result: New BitKeeper file ``mysql-test/r/func_des_encrypt.result'' mysql-test/t/func_des_encrypt.test: New BitKeeper file ``mysql-test/t/func_des_encrypt.test'' BitKeeper/etc/config: Disable openlogging
Diffstat (limited to 'mysql-test/r/func_des_encrypt.result')
-rw-r--r--mysql-test/r/func_des_encrypt.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/func_des_encrypt.result b/mysql-test/r/func_des_encrypt.result
new file mode 100644
index 00000000000..46b30bdab58
--- /dev/null
+++ b/mysql-test/r/func_des_encrypt.result
@@ -0,0 +1,3 @@
+select des_encrypt('hello');
+des_encrypt('hello')
+€Ö2nV“Ø}