diff options
| author | unknown <konstantin@oak.local> | 2003-12-22 15:57:34 +0300 |
|---|---|---|
| committer | unknown <konstantin@oak.local> | 2003-12-22 15:57:34 +0300 |
| commit | f2ddb590e381bfe669e99884a298436a52eddafc (patch) | |
| tree | c1a9365ba440244439a52546ade439579f032650 /sql-common/client.c | |
| parent | f13383a561946742093e1d8de01c1cb706aabb16 (diff) | |
| download | mariadb-git-f2ddb590e381bfe669e99884a298436a52eddafc.tar.gz | |
Names of all client methods (static functions inside client.c) now
uniform: cli_ + member name.
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 14b45942e15..08b39d2ca58 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1403,15 +1403,15 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused))) before calling mysql_real_connect ! */ -static my_bool cli_mysql_read_query_result(MYSQL *mysql); -static MYSQL_RES *cli_mysql_use_result(MYSQL *mysql); +static my_bool cli_read_query_result(MYSQL *mysql); +static MYSQL_RES *cli_use_result(MYSQL *mysql); static MYSQL_METHODS client_methods= { - cli_mysql_read_query_result, + cli_read_query_result, cli_advanced_command, cli_read_rows, - cli_mysql_use_result, + cli_use_result, cli_fetch_lengths #ifndef MYSQL_SERVER ,cli_list_fields, @@ -2022,7 +2022,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, goto error; if (mysql->fields) { - if (!(res= cli_mysql_use_result(mysql))) + if (!(res= cli_use_result(mysql))) goto error; mysql_free_result(res); } @@ -2240,13 +2240,13 @@ void STDCALL mysql_close(MYSQL *mysql) DBUG_VOID_RETURN; } -static my_bool cli_mysql_read_query_result(MYSQL *mysql) +static my_bool cli_read_query_result(MYSQL *mysql) { uchar *pos; ulong field_count; MYSQL_DATA *fields; ulong length; - DBUG_ENTER("cli_mysql_read_query_result"); + DBUG_ENTER("cli_read_query_result"); /* Read from the connection which we actually used, which @@ -2419,10 +2419,10 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql) have to wait for the client (and will not wait more than 30 sec/packet). **************************************************************************/ -static MYSQL_RES * cli_mysql_use_result(MYSQL *mysql) +static MYSQL_RES * cli_use_result(MYSQL *mysql) { MYSQL_RES *result; - DBUG_ENTER("cli_mysql_use_result"); + DBUG_ENTER("cli_use_result"); mysql = mysql->last_used_con; |