Fixes for MSVC++ compiler.

libmysql/client_settings.h

@@ -42,7 +42,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
 
 void mysql_read_default_options(struct st_mysql_options *options,
 				const char *filename,const char *group);
-MYSQL * STDCALL
+MYSQL *
 cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 		       const char *passwd, const char *db,
 		       uint port, const char *unix_socket,ulong client_flag);

sql/sql_select.cc

@@ -1726,7 +1726,6 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
        tables;
        s++, tables= tables->next_local, i++)
   {
-    table_map dep_tables;
     TABLE_LIST *embedding= tables->embedding;
     stat_vector[i]=s;
     s->keys.init();

sql/sql_view.cc

@@ -788,7 +788,7 @@ frm_type_enum mysql_frm_type(char *path)
   {
     DBUG_RETURN(FRMTYPE_ERROR);
   }
-  if (my_read(file, header, 10, MYF(MY_WME)) == MY_FILE_ERROR)
+  if (my_read(file, (byte*) header, 10, MYF(MY_WME)) == MY_FILE_ERROR)
   {
     my_close(file, MYF(MY_WME));
     DBUG_RETURN(FRMTYPE_ERROR);