mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Rename:
read_statistic -> read_statistics (statistic is adjective)
This commit is contained in:
@ -575,7 +575,7 @@ typedef struct st_mysql_methods
|
|||||||
MYSQL_DATA *(*read_binary_rows)(MYSQL_STMT *stmt);
|
MYSQL_DATA *(*read_binary_rows)(MYSQL_STMT *stmt);
|
||||||
int (*unbuffered_fetch)(MYSQL *mysql, char **row);
|
int (*unbuffered_fetch)(MYSQL *mysql, char **row);
|
||||||
void (*free_embedded_thd)(MYSQL *mysql);
|
void (*free_embedded_thd)(MYSQL *mysql);
|
||||||
const char *(*read_statistic)(MYSQL *mysql);
|
const char *(*read_statistics)(MYSQL *mysql);
|
||||||
int (*next_result)(MYSQL *mysql);
|
int (*next_result)(MYSQL *mysql);
|
||||||
int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);
|
int (*read_change_user_result)(MYSQL *mysql, char *buff, const char *passwd);
|
||||||
#endif
|
#endif
|
||||||
|
@ -57,7 +57,7 @@ MYSQL_DATA * cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
|
|||||||
int cli_stmt_execute(MYSQL_STMT *stmt);
|
int cli_stmt_execute(MYSQL_STMT *stmt);
|
||||||
MYSQL_DATA * cli_read_binary_rows(MYSQL_STMT *stmt);
|
MYSQL_DATA * cli_read_binary_rows(MYSQL_STMT *stmt);
|
||||||
int cli_unbuffered_fetch(MYSQL *mysql, char **row);
|
int cli_unbuffered_fetch(MYSQL *mysql, char **row);
|
||||||
const char * cli_read_statistic(MYSQL *mysql);
|
const char * cli_read_statistics(MYSQL *mysql);
|
||||||
int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd);
|
int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd);
|
||||||
|
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
|
@ -1126,7 +1126,7 @@ mysql_dump_debug_info(MYSQL *mysql)
|
|||||||
DBUG_RETURN(simple_command(mysql,COM_DEBUG,0,0,0));
|
DBUG_RETURN(simple_command(mysql,COM_DEBUG,0,0,0));
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *cli_read_statistic(MYSQL *mysql)
|
const char *cli_read_statistics(MYSQL *mysql)
|
||||||
{
|
{
|
||||||
mysql->net.read_pos[mysql->packet_length]=0; /* End of stat string */
|
mysql->net.read_pos[mysql->packet_length]=0; /* End of stat string */
|
||||||
if (!mysql->net.read_pos[0])
|
if (!mysql->net.read_pos[0])
|
||||||
@ -1145,7 +1145,7 @@ mysql_stat(MYSQL *mysql)
|
|||||||
DBUG_ENTER("mysql_stat");
|
DBUG_ENTER("mysql_stat");
|
||||||
if (simple_command(mysql,COM_STATISTICS,0,0,0))
|
if (simple_command(mysql,COM_STATISTICS,0,0,0))
|
||||||
return mysql->net.last_error;
|
return mysql->net.last_error;
|
||||||
DBUG_RETURN((*mysql->methods->read_statistic)(mysql));
|
DBUG_RETURN((*mysql->methods->read_statistics)(mysql));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -234,7 +234,7 @@ static void emb_free_embedded_thd(MYSQL *mysql)
|
|||||||
delete thd;
|
delete thd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char * emb_read_statistic(MYSQL *mysql)
|
static const char * emb_read_statistics(MYSQL *mysql)
|
||||||
{
|
{
|
||||||
THD *thd= (THD*)mysql->thd;
|
THD *thd= (THD*)mysql->thd;
|
||||||
return thd->net.last_error;
|
return thd->net.last_error;
|
||||||
@ -279,7 +279,7 @@ MYSQL_METHODS embedded_methods=
|
|||||||
emb_read_binary_rows,
|
emb_read_binary_rows,
|
||||||
emb_unbuffered_fetch,
|
emb_unbuffered_fetch,
|
||||||
emb_free_embedded_thd,
|
emb_free_embedded_thd,
|
||||||
emb_read_statistic,
|
emb_read_statistics,
|
||||||
emb_next_result,
|
emb_next_result,
|
||||||
emb_read_change_user_result
|
emb_read_change_user_result
|
||||||
};
|
};
|
||||||
|
@ -1422,7 +1422,7 @@ static MYSQL_METHODS client_methods=
|
|||||||
cli_read_binary_rows,
|
cli_read_binary_rows,
|
||||||
cli_unbuffered_fetch,
|
cli_unbuffered_fetch,
|
||||||
NULL,
|
NULL,
|
||||||
cli_read_statistic,
|
cli_read_statistics,
|
||||||
cli_read_query_result,
|
cli_read_query_result,
|
||||||
cli_read_change_user_result
|
cli_read_change_user_result
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user