diff options
Diffstat (limited to 'databases/mysql41-server/files')
| -rw-r--r-- | databases/mysql41-server/files/patch-Makefile.in | 2 | ||||
| -rw-r--r-- | databases/mysql41-server/files/patch-sql::mysqld.cc | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in index 4ae2c3ea9443..40726234d2a4 100644 --- a/databases/mysql41-server/files/patch-Makefile.in +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -7,7 +7,7 @@ -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ -- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ +- @sql_union_dirs@ scripts man tests \ - netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc index c98d38bcbd10..e79f985fcb69 100644 --- a/databases/mysql41-server/files/patch-sql::mysqld.cc +++ b/databases/mysql41-server/files/patch-sql::mysqld.cc @@ -9,39 +9,3 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> -@@ -136,15 +136,6 @@ - int allow_severity = LOG_INFO; - int deny_severity = LOG_WARNING; - --#ifdef __STDC__ --#define my_fromhost(A) fromhost(A) --#define my_hosts_access(A) hosts_access(A) --#define my_eval_client(A) eval_client(A) --#else --#define my_fromhost(A) fromhost() --#define my_hosts_access(A) hosts_access() --#define my_eval_client(A) eval_client() --#endif /* __STDC__ */ - #endif /* HAVE_LIBWRAP */ - - #ifdef HAVE_SYS_MMAN_H -@@ -3565,8 +3556,8 @@ - struct request_info req; - signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); -- my_fromhost(&req); -- if (!my_hosts_access(&req)) -+ fromhost(&req); -+ if (!hosts_access(&req)) - { - /* - This may be stupid but refuse() includes an exit(0) -@@ -3574,7 +3565,7 @@ - clean_exit() - same stupid thing ... - */ - syslog(deny_severity, "refused connect from %s", -- my_eval_client(&req)); -+ eval_client(&req)); - - /* - C++ sucks (the gibberish in front just translates the supplied |