diff options
author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-04 10:54:23 +0500 |
---|---|---|
committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-04 10:54:23 +0500 |
commit | 5fb8b93e98a57ee55143b8b1de9cefeaf6d7bb95 (patch) | |
tree | a957b37d0a5d97417fae7047a8414ebce2032871 /sql/sql_acl.cc | |
parent | 744373ecc02462839db2800f17d0f92a6ff57968 (diff) | |
parent | 8041311e24441351fbb42b5ef99f9fd703fde5da (diff) | |
download | mariadb-git-5fb8b93e98a57ee55143b8b1de9cefeaf6d7bb95.tar.gz |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 4481d58d38d..be52fae2007 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6242,6 +6242,7 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, DBUG_RETURN(TRUE); thd->lex->ssl_type= SSL_TYPE_NOT_SPECIFIED; + thd->lex->ssl_cipher= thd->lex->x509_subject= thd->lex->x509_issuer= 0; bzero((char*) &thd->lex->mqh, sizeof(thd->lex->mqh)); /* |