summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_innobase.cc2
-rw-r--r--sql/violite.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 8e3a66882ca..25c7757259a 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -230,7 +230,7 @@ innobase_mysql_print_thd(
}
if (thd->query) {
- printf("\n%0.100s", thd->query);
+ printf("\n%.100s", thd->query);
}
printf("\n");
diff --git a/sql/violite.c b/sql/violite.c
index 932861b10c2..37fee6fad3d 100644
--- a/sql/violite.c
+++ b/sql/violite.c
@@ -38,8 +38,12 @@
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__FreeBSD__)
+#include <netinet/in_systm.h>
#include <netinet/ip.h>
#if !defined(alpha_linux_port)
#include <netinet/tcp.h>