summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-28 14:47:33 +0200
committerunknown <monty@mysql.com>2003-11-28 14:47:33 +0200
commitaa780843961c3f60028d62da7728bdb907b1f6ee (patch)
treeed124194f013e56fbbdd0573ecdea88af8d300dc /libmysql
parent56b45eea1d349fb9a2e7698c3ab07a7c4c8ab61c (diff)
parentf531c8015547f75c347220a9df9537b5def6ce5f (diff)
downloadmariadb-git-aa780843961c3f60028d62da7728bdb907b1f6ee.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/conf_to_src.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c
index 95ffcf1cb2b..8d931309abb 100644
--- a/libmysql/conf_to_src.c
+++ b/libmysql/conf_to_src.c
@@ -16,9 +16,9 @@
/* can't use -lmysys because this prog is used to create -lstrings */
+
+#include <my_global.h>
#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>