mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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
This commit is contained in:
3
mysql-test/r/func_des_encrypt.result
Normal file
3
mysql-test/r/func_des_encrypt.result
Normal file
@ -0,0 +1,3 @@
|
||||
select des_encrypt('hello');
|
||||
des_encrypt('hello')
|
||||
<EFBFBD><EFBFBD>2nV<6E><56>}
|
9
mysql-test/t/func_des_encrypt.test
Normal file
9
mysql-test/t/func_des_encrypt.test
Normal file
@ -0,0 +1,9 @@
|
||||
-- source include/have_openssl.inc
|
||||
|
||||
# This test can't be in func_encrypt.test, because it requires
|
||||
# --des-key-file to not be set.
|
||||
|
||||
#
|
||||
# Bug #11643: des_encrypt() causes server to die
|
||||
#
|
||||
select des_encrypt('hello');
|
Reference in New Issue
Block a user