summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-28 14:23:54 +0200
committerunknown <monty@mysql.com>2003-11-28 14:23:54 +0200
commitf531c8015547f75c347220a9df9537b5def6ce5f (patch)
tree48ab6a8a0dff816ab7be757cabb3374a2c8f8065 /libmysql
parenta723514bdd547de6f2e339e265805140ee0befde (diff)
parentef43220170521a90454c05380cc01d562fc98c2f (diff)
downloadmariadb-git-f531c8015547f75c347220a9df9537b5def6ce5f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1 sql-common/client.c: Auto merged
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>