diff options
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 6bbbe653cdd..a5879081566 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -89,7 +89,7 @@ static MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, my_bool default_value, my_bool long_flag_protocol); -static void mc_end_server(MYSQL *mysql); +void mc_end_server(MYSQL *mysql); static int mc_sock_connect(File s, const struct sockaddr *name, uint namelen, uint to); static void mc_free_old_query(MYSQL *mysql); static int mc_send_file_to_server(MYSQL *mysql, const char *filename); @@ -194,8 +194,7 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host, ** Init MySQL structure or allocate one ****************************************************************************/ -MYSQL * STDCALL -mc_mysql_init(MYSQL *mysql) +MYSQL *mc_mysql_init(MYSQL *mysql) { init_client_errs(); if (!mysql) @@ -217,7 +216,7 @@ mc_mysql_init(MYSQL *mysql) ** Shut down connection **************************************************************************/ -static void +void mc_end_server(MYSQL *mysql) { DBUG_ENTER("mc_end_server"); @@ -339,7 +338,7 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, ** or packet is an error message *****************************************************************************/ -ulong STDCALL +ulong mc_net_safe_read(MYSQL *mysql) { NET *net= &mysql->net; @@ -400,17 +399,17 @@ max_allowed_packet on this server"); } -char * STDCALL mc_mysql_error(MYSQL *mysql) +char * mc_mysql_error(MYSQL *mysql) { return (mysql)->net.last_error; } -int STDCALL mc_mysql_errno(MYSQL *mysql) +int mc_mysql_errno(MYSQL *mysql) { return (mysql)->net.last_errno; } -my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql) +my_bool mc_mysql_reconnect(MYSQL *mysql) { MYSQL tmp_mysql; DBUG_ENTER("mc_mysql_reconnect"); @@ -440,7 +439,7 @@ my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql) -int STDCALL +int mc_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, uint length, my_bool skipp_check) { @@ -493,7 +492,7 @@ mc_simple_command(MYSQL *mysql,enum enum_server_command command, } -MYSQL * STDCALL +MYSQL * mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,uint client_flag) @@ -844,7 +843,7 @@ error: ** NB! Errors are not reported until you do mysql_real_connect. ************************************************************************** */ -int STDCALL +int mysql_ssl_clear(MYSQL *mysql) { my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR)); @@ -867,7 +866,7 @@ mysql_ssl_clear(MYSQL *mysql) ** If handle is alloced by mysql connect free it. *************************************************************************/ -void STDCALL +void mc_mysql_close(MYSQL *mysql) { DBUG_ENTER("mysql_close"); @@ -898,7 +897,7 @@ mc_mysql_close(MYSQL *mysql) DBUG_VOID_RETURN; } -void STDCALL mc_mysql_free_result(MYSQL_RES *result) +void mc_mysql_free_result(MYSQL_RES *result) { DBUG_ENTER("mc_mysql_free_result"); DBUG_PRINT("enter",("mysql_res: %lx",result)); @@ -976,13 +975,13 @@ mc_unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, DBUG_RETURN(result); } -int STDCALL +int mc_mysql_send_query(MYSQL* mysql, const char* query, uint length) { return mc_simple_command(mysql, COM_QUERY, query, length, 1); } -int STDCALL mc_mysql_read_query_result(MYSQL *mysql) +int mc_mysql_read_query_result(MYSQL *mysql) { uchar *pos; ulong field_count; @@ -1030,7 +1029,7 @@ get_info: DBUG_RETURN(0); } -int STDCALL mc_mysql_query(MYSQL *mysql, const char *query, uint length) +int mc_mysql_query(MYSQL *mysql, const char *query, uint length) { DBUG_ENTER("mysql_real_query"); DBUG_PRINT("enter",("handle: %lx",mysql)); @@ -1281,17 +1280,17 @@ static int mc_read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, return 0; } -my_ulonglong STDCALL mc_mysql_num_rows(MYSQL_RES *res) +my_ulonglong mc_mysql_num_rows(MYSQL_RES *res) { return res->row_count; } -unsigned int STDCALL mc_mysql_num_fields(MYSQL_RES *res) +unsigned int mc_mysql_num_fields(MYSQL_RES *res) { return res->field_count; } -void STDCALL mc_mysql_data_seek(MYSQL_RES *result, my_ulonglong row) +void mc_mysql_data_seek(MYSQL_RES *result, my_ulonglong row) { MYSQL_ROWS *tmp=0; DBUG_PRINT("info",("mysql_data_seek(%ld)",(long) row)); @@ -1301,7 +1300,7 @@ void STDCALL mc_mysql_data_seek(MYSQL_RES *result, my_ulonglong row) result->data_cursor = tmp; } -MYSQL_ROW STDCALL mc_mysql_fetch_row(MYSQL_RES *res) +MYSQL_ROW mc_mysql_fetch_row(MYSQL_RES *res) { DBUG_ENTER("mc_mysql_fetch_row"); if (!res->data) @@ -1336,7 +1335,7 @@ MYSQL_ROW STDCALL mc_mysql_fetch_row(MYSQL_RES *res) } } -int STDCALL mc_mysql_select_db(MYSQL *mysql, const char *db) +int mc_mysql_select_db(MYSQL *mysql, const char *db) { int error; DBUG_ENTER("mysql_select_db"); @@ -1350,7 +1349,7 @@ int STDCALL mc_mysql_select_db(MYSQL *mysql, const char *db) } -MYSQL_RES * STDCALL mc_mysql_store_result(MYSQL *mysql) +MYSQL_RES *mc_mysql_store_result(MYSQL *mysql) { MYSQL_RES *result; DBUG_ENTER("mysql_store_result"); |