diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:40:36 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-15 22:40:36 +0300 |
| commit | ddbc8428546da197a031d24cfcafd1a545467e9b (patch) | |
| tree | dcc59a0d59657900722d4e51c1daeceec81df437 /libmysql | |
| parent | 086ec556f87701cad20a75031d7fb1ab3cd3b350 (diff) | |
| download | mariadb-git-ddbc8428546da197a031d24cfcafd1a545467e9b.tar.gz | |
Portability fixes for windows
After merge fixes
include/my_base.h:
Fix comment syntax
libmysql/client_settings.h:
Portability fixes for windows
libmysql/libmysql.c:
Portability fixes for windows
libmysql/libmysql.def:
Portability fixes for windows
mysql-test/r/variables.result:
Fix result after merge
sql-common/client.c:
Portability fixes for windows
sql/ha_berkeley.cc:
Use defines instead of constants
sql/item_strfunc.cc:
Portability fixes for windows
sql/mysql_priv.h:
Use defines instead of defines
sql/mysqld.cc:
After merge fix
sql/opt_range.h:
After merge fix
sql/set_var.h:
Portability fixes for windows
sql/sql_class.cc:
Defines instead of constants
sql/sql_help.cc:
after merge fixes
More OOM error checking
sql/sql_prepare.cc:
After merge fixes
sql/sql_table.cc:
Portability fixes for windows
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/client_settings.h | 6 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index b9c47c1dd55..582f9613ee0 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -52,9 +52,9 @@ void STDCALL cli_mysql_close(MYSQL *mysql); MYSQL_FIELD * STDCALL cli_list_fields(MYSQL *mysql); my_bool STDCALL cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt); -MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, - uint fields); +MYSQL_DATA * STDCALL cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, + uint fields); int STDCALL cli_stmt_execute(MYSQL_STMT *stmt); -MYSQL_DATA *cli_read_binary_rows(MYSQL_STMT *stmt); +MYSQL_DATA * STDCALL cli_read_binary_rows(MYSQL_STMT *stmt); int STDCALL cli_unbuffered_fetch(MYSQL *mysql, char **row); const char * STDCALL cli_read_statistic(MYSQL *mysql); diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 08ea9deb11e..af39d3228e0 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3098,7 +3098,7 @@ no_data: Read all rows of data from server (binary format) */ -MYSQL_DATA *cli_read_binary_rows(MYSQL_STMT *stmt) +MYSQL_DATA * STDCALL cli_read_binary_rows(MYSQL_STMT *stmt) { ulong pkt_len; uchar *cp; diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 1abc924e9c0..787aa645017 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -81,7 +81,7 @@ EXPORTS mysql_param_result mysql_ping mysql_prepare - mysql_prepare_result + mysql_get_metadata mysql_query mysql_read_query_result mysql_real_connect |