1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
This commit is contained in:
cmiller@zippy.cornsilk.net 2006-09-05 13:52:06 -04:00
commit 1b60377484
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/yassl/include/openssl/prefix_ssl.h
View File

@ -1,5 +1,6 @@
#define Copyright yaCopyright #define Copyright yaCopyright
#define yaSSL_CleanUp yayaSSL_CleanUp #define yaSSL_CleanUp yayaSSL_CleanUp
#define BN_bin2bn yaBN_bin2bn
#define DH_new yaDH_new #define DH_new yaDH_new
#define DH_free yaDH_free #define DH_free yaDH_free
#define RSA_free yaRSA_free #define RSA_free yaRSA_free
@ -92,6 +93,12 @@
#define SSL_want_read yaSSL_want_read #define SSL_want_read yaSSL_want_read
#define SSL_want_write yaSSL_want_write #define SSL_want_write yaSSL_want_write
#define SSL_pending yaSSL_pending #define SSL_pending yaSSL_pending
#define SSLv3_method yaSSLv3_method
#define SSLv3_server_method yaSSLv3_server_method
#define SSLv3_client_method yaSSLv3_client_method
#define TLSv1_server_method yaTLSv1_server_method
#define TLSv1_client_method yaTLSv1_client_method
#define SSLv23_server_method yaSSLv23_server_method
#define SSL_CTX_use_certificate_file yaSSL_CTX_use_certificate_file #define SSL_CTX_use_certificate_file yaSSL_CTX_use_certificate_file
#define SSL_CTX_use_PrivateKey_file yaSSL_CTX_use_PrivateKey_file #define SSL_CTX_use_PrivateKey_file yaSSL_CTX_use_PrivateKey_file
#define SSL_CTX_set_cipher_list yaSSL_CTX_set_cipher_list #define SSL_CTX_set_cipher_list yaSSL_CTX_set_cipher_list
@ -115,11 +122,13 @@
#define RAND_write_file yaRAND_write_file #define RAND_write_file yaRAND_write_file
#define RAND_load_file yaRAND_load_file #define RAND_load_file yaRAND_load_file
#define RAND_status yaRAND_status #define RAND_status yaRAND_status
#define RAND_bytes yaRAND_bytes
#define DES_set_key yaDES_set_key #define DES_set_key yaDES_set_key
#define DES_set_odd_parity yaDES_set_odd_parity #define DES_set_odd_parity yaDES_set_odd_parity
#define DES_ecb_encrypt yaDES_ecb_encrypt #define DES_ecb_encrypt yaDES_ecb_encrypt
#define SSL_CTX_set_default_passwd_cb_userdata yaSSL_CTX_set_default_passwd_cb_userdata #define SSL_CTX_set_default_passwd_cb_userdata yaSSL_CTX_set_default_passwd_cb_userdata
#define SSL_SESSION_free yaSSL_SESSION_free #define SSL_SESSION_free yaSSL_SESSION_free
#define SSL_peek yaSSL_peek
#define SSL_get_certificate yaSSL_get_certificate #define SSL_get_certificate yaSSL_get_certificate
#define SSL_get_privatekey yaSSL_get_privatekey #define SSL_get_privatekey yaSSL_get_privatekey
#define X509_get_pubkey yaX509_get_pubkey #define X509_get_pubkey yaX509_get_pubkey
@ -150,4 +159,3 @@
#define MD5_Init yaMD5_Init #define MD5_Init yaMD5_Init
#define MD5_Update yaMD5_Update #define MD5_Update yaMD5_Update
#define MD5_Final yaMD5_Final #define MD5_Final yaMD5_Final
#define SSL_peek yaSSL_peek

4
mysql-test/r/ctype_ucs.result
View File

@ -763,10 +763,6 @@ select old_password(name) from bug20536;
old_password(name) old_password(name)
???????? ????????
???????? ????????
select encrypt(name, 'SALT') from bug20536;
encrypt(name, 'SALT')
SA5pDi1UPZdys
SA5pDi1UPZdys
select quote(name) from bug20536; select quote(name) from bug20536;
quote(name) quote(name)
???????? ????????

5
mysql-test/t/ctype_ucs.test
View File

@ -491,11 +491,16 @@ select export_set(5, name, upper(name), ",", 5) from bug20536;
select password(name) from bug20536; select password(name) from bug20536;
select old_password(name) from bug20536; select old_password(name) from bug20536;
# Disable test case as encrypt relies on 'crypt' function.
# "decrypt" is noramlly tested in func_crypt.test which have a
# "have_crypt.inc" test
--disable_parsing
# ENCRYPT relies on OS function crypt() which takes a NUL-terminated string; it # ENCRYPT relies on OS function crypt() which takes a NUL-terminated string; it
# doesn't return good results for strings with embedded 0 bytes. It won't be # doesn't return good results for strings with embedded 0 bytes. It won't be
# fixed unless we choose to re-implement the crypt() function ourselves to take # fixed unless we choose to re-implement the crypt() function ourselves to take
# an extra size_t string_length argument. # an extra size_t string_length argument.
select encrypt(name, 'SALT') from bug20536; select encrypt(name, 'SALT') from bug20536;
--enable_parsing
# QUOTE doesn't work with UCS2 data. It would require a total rewrite # QUOTE doesn't work with UCS2 data. It would require a total rewrite
# of Item_func_quote::val_str(), which isn't worthwhile until UCS2 is # of Item_func_quote::val_str(), which isn't worthwhile until UCS2 is