diff options
| author | jimw@mysql.com <> | 2006-05-08 16:38:45 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2006-05-08 16:38:45 -0700 |
| commit | ebe38efaa6feaff5dd7f1e5dfb8dbd6cbf253c29 (patch) | |
| tree | 61a75e4b77c3ded4e660e42076b4d7cc71af45ab /include/sslopt-vars.h | |
| parent | 91031fc2bc34c5bb020e2696e7f519a98b71e774 (diff) | |
| download | mariadb-git-ebe38efaa6feaff5dd7f1e5dfb8dbd6cbf253c29.tar.gz | |
Bug #1039: tmpdir and datadir not available via @@ system variable syntax
Bug #19606: ssl variables are not displayed in show variables
Bug #19616: log_queries_not_using_indexes is not listed in show variables
Make basedir, datadir, tmpdir, log_queries_not_using_indexes, ssl_ca,
ssl_capath, ssl_cert, ssl_cipher, and ssl_key all available both from
SHOW VARIABLES and as @@variables.
As a side-effect of this change, log_queries_not_using_indexes can
be changed at runtime (but only globally, not per-connection).
Diffstat (limited to 'include/sslopt-vars.h')
| -rw-r--r-- | include/sslopt-vars.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h index 164cf541381..3b9b10c82e7 100644 --- a/include/sslopt-vars.h +++ b/include/sslopt-vars.h @@ -15,10 +15,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_OPENSSL -static my_bool opt_use_ssl = 0; -static char *opt_ssl_key = 0; -static char *opt_ssl_cert = 0; -static char *opt_ssl_ca = 0; -static char *opt_ssl_capath = 0; -static char *opt_ssl_cipher = 0; +#ifdef SSL_VARS_NOT_STATIC +#define SSL_STATIC +#else +#define SSL_STATIC static +#endif +SSL_STATIC my_bool opt_use_ssl = 0; +SSL_STATIC char *opt_ssl_ca = 0; +SSL_STATIC char *opt_ssl_capath = 0; +SSL_STATIC char *opt_ssl_cert = 0; +SSL_STATIC char *opt_ssl_cipher = 0; +SSL_STATIC char *opt_ssl_key = 0; #endif |