diff options
| author | monty@mysql.com <> | 2004-12-18 05:19:21 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-18 05:19:21 +0200 |
| commit | 3fb088a075ebd3e4fe78d122911103618bd1cbe4 (patch) | |
| tree | eb62c04f31efc6c7cb435cef36a43e2e361eed1c /vio/viosslfactories.c | |
| parent | b4dc75c877b45e2eb97e5fc15fda4292e0f6f705 (diff) | |
| download | mariadb-git-3fb088a075ebd3e4fe78d122911103618bd1cbe4.tar.gz | |
Add 0x before pointers (to help with debugging)
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 498d10da0ee..44a077c33fc 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -80,7 +80,7 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) { DBUG_ENTER("vio_set_cert_stuff"); - DBUG_PRINT("enter", ("ctx=%p, cert_file=%s, key_file=%s", + DBUG_PRINT("enter", ("ctx: %p, cert_file: %s, key_file: %s", ctx, cert_file, key_file)); if (cert_file != NULL) { @@ -131,7 +131,7 @@ vio_verify_callback(int ok, X509_STORE_CTX *ctx) int err,depth; DBUG_ENTER("vio_verify_callback"); - DBUG_PRINT("enter", ("ok=%d, ctx=%p", ok, ctx)); + DBUG_PRINT("enter", ("ok: %d, ctx: 0x%p", ok, ctx)); err_cert=X509_STORE_CTX_get_current_cert(ctx); err= X509_STORE_CTX_get_error(ctx); depth= X509_STORE_CTX_get_error_depth(ctx); @@ -220,7 +220,7 @@ new_VioSSLConnectorFd(const char* key_file, DH *dh; DBUG_ENTER("new_VioSSLConnectorFd"); DBUG_PRINT("enter", - ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s, cipher=%s", + ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s", key_file, cert_file, ca_path, ca_file, cipher)); if (!(ptr=((struct st_VioSSLConnectorFd*) @@ -315,7 +315,7 @@ new_VioSSLAcceptorFd(const char *key_file, DH *dh; DBUG_ENTER("new_VioSSLAcceptorFd"); DBUG_PRINT("enter", - ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s, cipher=%s", + ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s", key_file, cert_file, ca_path, ca_file, cipher)); ptr= ((struct st_VioSSLAcceptorFd*) |