database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-11643

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_strfunc.cc:
  Auto merged
BitKeeper/etc/config:
  Resolve conflict
This commit is contained in:
unknown
2005-07-12 09:31:07 -07:00
parent 2fdbbffeb4 01b66f3f34
commit 41b038b548
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_des_encrypt.result Normal file
View 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
View 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');