diff options
author | unknown <konstantin@mysql.com> | 2004-07-19 13:43:19 -0700 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-07-19 13:43:19 -0700 |
commit | f1d2c051ae67dc9cf1a2af92ecce7aeb5979a927 (patch) | |
tree | 6a94ad53cb8283c56ef5915dd1323c95279b69cf /libmysql/client_settings.h | |
parent | 7d91d3f0bf0377a3333ae8eff41a1dbe855d9621 (diff) | |
download | mariadb-git-f1d2c051ae67dc9cf1a2af92ecce7aeb5979a927.tar.gz |
Fixes for MSVC++ compiler.
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.
Diffstat (limited to 'libmysql/client_settings.h')
-rw-r--r-- | libmysql/client_settings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 1d4f45b729f..1c1ff9bac10 100644 --- a/libmysql/client_settings.h +++ b/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); |