Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

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,

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)

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;
 

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;