summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-05-31 12:56:05 +0200
committerunknown <monty@work.mysql.com>2001-05-31 12:56:05 +0200
commite6ecbfd629bf92c84f270119405f4796464e7f4e (patch)
tree7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /libmysql
parenta14542a61fbaabf30a2735a74401e4cd2734314d (diff)
parent8c8244918fc37bb25656a5f8b451a362e4b16577 (diff)
downloadmariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz
merge
BitKeeper/triggers/post-commit: Auto merged acinclude.m4: Auto merged configure.in: Auto merged Docs/manual.texi: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_table.cc: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/net.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmysql/net.c b/libmysql/net.c
index 44c082c1693..809cfb41e83 100644
--- a/libmysql/net.c
+++ b/libmysql/net.c
@@ -39,7 +39,6 @@
#include <signal.h>
#include <errno.h>
#include <sys/types.h>
-#include <violite.h>
#include <assert.h>
#ifdef MYSQL_SERVER