1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for MSVC++ compiler.

Browse Source 
libmysql/client_settings.h:
  Fixed declaration to be in line with definition
sql/sql_select.cc:
  Not used variable removed.
sql/sql_view.cc:
  Explicit cast to unsigned char * is required here.
This commit is contained in:
unknown 2004-07-19 13:43:19 -07:00
parent 7d91d3f0bf
commit f1d2c051ae
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/client_settings.h
View File

@ -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, void mysql_read_default_options(struct st_mysql_options *options,
const char *filename,const char *group); const char *filename,const char *group);
MYSQL * STDCALL MYSQL *
cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user, cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
const char *passwd, const char *db, const char *passwd, const char *db,
uint port, const char *unix_socket,ulong client_flag); uint port, const char *unix_socket,ulong client_flag);

1
sql/sql_select.cc
View File

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

2
sql/sql_view.cc
View File

@ -788,7 +788,7 @@ frm_type_enum mysql_frm_type(char *path)
{ {
DBUG_RETURN(FRMTYPE_ERROR); 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)); my_close(file, MYF(MY_WME));
DBUG_RETURN(FRMTYPE_ERROR); DBUG_RETURN(FRMTYPE_ERROR);