diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-22 17:14:50 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-22 17:14:50 +0200 |
| commit | 17a76b00c65ef8da504bee2163a276b989bfe7f7 (patch) | |
| tree | 8220b0ddede3a4122157e73888b9261d97c11ad0 /libmysqld/libmysqld.c | |
| parent | 72065f34e674d5dcbb8a6c7d6e96609fbb3ecab7 (diff) | |
| parent | 8d05f9ef3eedafc10a9b37781240d6f286c27f37 (diff) | |
| download | mariadb-git-17a76b00c65ef8da504bee2163a276b989bfe7f7.tar.gz | |
merge fix
client/mysql.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysqld/libmysqld.c')
| -rw-r--r-- | libmysqld/libmysqld.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 4ec37e12325..8cf4e2fbe7e 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -66,7 +66,7 @@ TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"", #define closesocket(A) close(A) #endif -void STDCALL mysql_once_init(void); +void mysql_once_init(void); static void end_server(MYSQL *mysql); static void append_wild(char *to,char *end,const char *wild); static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, @@ -386,7 +386,7 @@ mysql_init(MYSQL *mysql) } -void STDCALL mysql_once_init() +void mysql_once_init() { if (!mysql_client_init) { @@ -1038,11 +1038,10 @@ mysql_list_fields(MYSQL *mysql __attribute__((unused)), const char *table __attr } /* List all running processes (threads) in server */ -#ifdef DUMMY - MYSQL_RES * STDCALL mysql_list_processes(MYSQL *mysql) { +#ifdef DUMMY MYSQL_DATA *fields; uint field_count; uchar *pos; @@ -1063,9 +1062,9 @@ mysql_list_processes(MYSQL *mysql) mysql->status=MYSQL_STATUS_GET_RESULT; mysql->field_count=field_count; DBUG_RETURN(mysql_store_result(mysql)); - return (MYSQL_RES*)mysql; -} #endif /*DUMMY*/ + return 0; +} int STDCALL |