diff options
| author | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
| commit | 0281a6b16026299bebebb58af1b88c2d741b57f6 (patch) | |
| tree | 103a1aadee6000a5d09b0ba7c1de75797fb958fa /include | |
| parent | 1a0e3423e6a311a8af79829b6a6088a909f1e320 (diff) | |
| download | mariadb-git-0281a6b16026299bebebb58af1b88c2d741b57f6.tar.gz | |
Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 6 | ||||
| -rw-r--r-- | include/violite.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 67132b4c4a4..c03d113ddf9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -19,15 +19,15 @@ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ - errmsg.h my_global.h my_net.h my_alloc.h\ - sslopt-longopts.h sslopt-usage.h \ + errmsg.h my_global.h my_net.h my_alloc.h \ + my_getopt.h sslopt-longopts.h sslopt-usage.h \ sslopt-vars.h $(BUILT_SOURCES) noinst_HEADERS = config-win.h config-os2.h \ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ my_dir.h mysys_err.h my_base.h \ my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ - my_aes.h my_getopt.h my_tree.h hash.h thr_alarm.h \ + my_aes.h my_tree.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in # mysql_version.h are generated diff --git a/include/violite.h b/include/violite.h index 6dd7b765071..0e53a13aca0 100644 --- a/include/violite.h +++ b/include/violite.h @@ -193,7 +193,14 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #endif /* HAVE_OPENSSL */ /* This enumerator is used in parser - should be always visible */ -enum SSL_type {SSL_TYPE_NONE, SSL_TYPE_ANY, SSL_TYPE_X509, SSL_TYPE_SPECIFIED}; +enum SSL_type +{ + SSL_TYPE_NOT_SPECIFIED= -1, + SSL_TYPE_NONE, + SSL_TYPE_ANY, + SSL_TYPE_X509, + SSL_TYPE_SPECIFIED +}; #ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ |