diff options
author | Alex Dupre <ale@FreeBSD.org> | 2005-04-06 13:38:29 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2005-04-06 13:38:29 +0000 |
commit | bd1e850d7249b66550078edcc36e27aa815d9a3b (patch) | |
tree | 0dadd99ae13da37b4847a12de40fb3f52fd8a84f /databases/mysql60-server/files/patch-sql::mysqld.cc | |
parent | 69df622682dfe0d2965b44143cdb89dfe252c7f5 (diff) |
Update to 5.0.3 release:
- Add the possibility to specify the database directory in rc.conf
- Move database creation from post-install stage into startup script
- Add the possibility to specify additional command-line arguments
to be passed to mysqld_safe on startup
Notes
Notes:
svn path=/head/; revision=132637
Diffstat (limited to 'databases/mysql60-server/files/patch-sql::mysqld.cc')
-rw-r--r-- | databases/mysql60-server/files/patch-sql::mysqld.cc | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc index c98d38bcbd10..e79f985fcb69 100644 --- a/databases/mysql60-server/files/patch-sql::mysqld.cc +++ b/databases/mysql60-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 |