summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-04-28 19:05:57 +0300
committerunknown <monty@mashka.mysql.fi>2003-04-28 19:05:57 +0300
commit68faea2eaa718bf3fe46e1c3f328346f7fd92f7e (patch)
tree96d5e3ccb7f58564a76e77f8eb11b497988864dc /libmysqld
parent8a05f5c7f497ff483f711dee55d3a1e7f5fe7e6a (diff)
downloadmariadb-git-68faea2eaa718bf3fe46e1c3f328346f7fd92f7e.tar.gz
Fix to remove compiler warnings
include/my_global.h: Fixed wrong #ifdef include/violite.h: Fix to remove compiler warning libmysqld/libmysqld.c: Fix to remove compiler warning myisam/sort.c: Fix to remove compiler warning myisammrg/myrg_extra.c: Fix to remove compiler warning vio/viossl.c: Fix to remove compiler warning
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/libmysqld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 3fba238a8bf..782731d4765 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -62,7 +62,7 @@ my_string mysql_unix_port=0;
#define closesocket(A) close(A)
#endif
-static void mysql_once_init(void);
+static void mysqld_once_init(void);
static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields,
uint field_count);
static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row,
@@ -729,7 +729,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths)
MYSQL * STDCALL
mysql_init(MYSQL *mysql)
{
- mysql_once_init();
+ mysqld_once_init();
if (!mysql)
{
if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL))))
@@ -743,7 +743,7 @@ mysql_init(MYSQL *mysql)
}
-static void mysql_once_init()
+static void mysqld_once_init()
{
if (!mysql_client_init)
{