bk commit into 5.0 tree (jani:1.2195) BUG#18246

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2195 06/06/21 18:35:19 jani@stripped +3 -0
  Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"

  sql/mysqld.cc
    1.557 06/06/21 18:35:14 jani@stripped +3 -10
    Include this block from my_libwra.h now.
    Moved two variables out of the otherwise
    same block.

  mysys/my_libwrap.c
    1.2 06/06/21 18:35:14 jani@stripped +9 -6
    Added comment and .c file now takes needed includes from
    the corresponding .h file.

  include/my_libwrap.h
    1.2 06/06/21 18:35:14 jani@stripped +9 -0
    Changed includes to the header file.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.556/sql/mysqld.cc	2006-06-21 02:23:10 +03:00
+++ 1.557/sql/mysqld.cc	2006-06-21 18:35:14 +03:00
@@ -120,16 +120,7 @@
 #include <sys/utsname.h>
 #endif /* __WIN__ */
 
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#include <syslog.h>
-#ifdef NEED_SYS_SYSLOG_H
-#include <sys/syslog.h>
-#endif /* NEED_SYS_SYSLOG_H */
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-
-#endif /* HAVE_LIBWRAP */
+#include <my_libwrap.h>
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -591,6 +582,8 @@
 #endif
 #ifdef HAVE_LIBWRAP
 const char *libwrapName= NULL;
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
 #endif
 #ifdef HAVE_QUERY_CACHE
 static ulong query_cache_limit= 0;

--- 1.1/include/my_libwrap.h	2006-06-21 02:21:26 +03:00
+++ 1.2/include/my_libwrap.h	2006-06-21 18:35:14 +03:00
@@ -14,6 +14,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#ifdef HAVE_LIBWRAP
+#include <tcpd.h>
+#include <syslog.h>
+#ifdef NEED_SYS_SYSLOG_H
+#include <sys/syslog.h>
+#endif /* NEED_SYS_SYSLOG_H */
+
 extern void my_fromhost(struct request_info *req);
 extern int my_hosts_access(struct request_info *req);
 extern char *my_eval_client(struct request_info *req);
+
+#endif /* HAVE_LIBWRAP */

--- 1.1/mysys/my_libwrap.c	2006-06-21 02:21:20 +03:00
+++ 1.2/mysys/my_libwrap.c	2006-06-21 18:35:14 +03:00
@@ -14,14 +14,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* 
+  This is needed to be able to compile with original libwrap header
+  files that don't have the prototypes
+*/
+
 #include <my_global.h>
+#include <my_libwrap.h>
+
 #ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#include <syslog.h>
-#ifdef NEED_SYS_SYSLOG_H
-#include <sys/syslog.h>
-#endif /* NEED_SYS_SYSLOG_H */
-#endif
 
 void my_fromhost(struct request_info *req)
 {
@@ -37,3 +38,5 @@
 {
   eval_client(req);
 }
+
+#endif /* HAVE_LIBWRAP */