diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-28 17:27:47 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-28 17:27:47 +0300 |
| commit | 914bc8686e4908e8602327745953f764fd39c596 (patch) | |
| tree | 2bfd3e82202f330ab2c8c6da6f5d749bd31583bc | |
| parent | 86feb16bad5fb7d09e2d5bc09da57fb48bd36981 (diff) | |
| parent | c326e59635dcfb6e2db6b2aac8cf6d459b377598 (diff) | |
| download | mariadb-git-914bc8686e4908e8602327745953f764fd39c596.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
| -rw-r--r-- | include/mysql.h | 10 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 4 | ||||
| -rw-r--r-- | sql-common/client.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/mysql.h b/include/mysql.h index 8e8ffc2b788..d58b729bfc1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -541,16 +541,16 @@ typedef struct st_mysql_stmt typedef struct st_mysql_methods { - my_bool STDCALL (*read_query_result)(MYSQL *mysql); - my_bool STDCALL (*advanced_command)(MYSQL *mysql, + my_bool (STDCALL *read_query_result)(MYSQL *mysql); + my_bool (STDCALL *advanced_command)(MYSQL *mysql, enum enum_server_command command, const char *header, unsigned long header_length, const char *arg, unsigned long arg_length, my_bool skip_check); - MYSQL_RES * STDCALL (*store_result)(MYSQL *mysql); - MYSQL_RES * STDCALL (*use_result)(MYSQL *mysql); - void STDCALL (*fetch_lengths)(unsigned long *to, MYSQL_ROW column, uint field_count); + MYSQL_RES * (STDCALL *store_result)(MYSQL *mysql); + MYSQL_RES * (STDCALL *use_result)(MYSQL *mysql); + void (STDCALL *fetch_lengths)(unsigned long *to, MYSQL_ROW column, uint field_count); } MYSQL_METHODS; MYSQL_STMT * STDCALL mysql_prepare(MYSQL * mysql, const char *query, diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index aaa31908360..05c36f353fd 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -48,7 +48,7 @@ static bool check_user(THD *thd, enum_server_command command, char * get_mysql_home(){ return mysql_home;}; char * get_mysql_real_data_home(){ return mysql_real_data_home;}; -my_bool +my_bool STDCALL emb_advanced_command(MYSQL *mysql, enum enum_server_command command, const char *header, ulong header_length, const char *arg, ulong arg_length, my_bool skip_check) diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 357c13c5826..48b3397ee7c 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -59,7 +59,7 @@ #endif void free_old_query(MYSQL *mysql); -my_bool +my_bool STDCALL emb_advanced_command(MYSQL *mysql, enum enum_server_command command, const char *header, ulong header_length, const char *arg, ulong arg_length, my_bool skip_check); @@ -169,7 +169,7 @@ static inline int mysql_init_charset(MYSQL *mysql) else the lengths are calculated from the offset between pointers. **************************************************************************/ -static void emb_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count) +static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count) { MYSQL_ROW end; diff --git a/sql-common/client.c b/sql-common/client.c index 25b18c27d8a..e410330d616 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -636,7 +636,7 @@ void free_rows(MYSQL_DATA *cur) } } -static my_bool +static my_bool STDCALL cli_advanced_command(MYSQL *mysql, enum enum_server_command command, const char *header, ulong header_length, const char *arg, ulong arg_length, my_bool skip_check) @@ -1008,7 +1008,7 @@ void mysql_read_default_options(struct st_mysql_options *options, else the lengths are calculated from the offset between pointers. **************************************************************************/ -static void cli_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count) +static void STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count) { ulong *prev_length; byte *start=0; |