diff options
| author | unknown <hf@deer.(none)> | 2003-10-04 19:28:08 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-10-04 19:28:08 +0500 |
| commit | 759aabf7df936bd8c39d032ca168acc85e60d7b0 (patch) | |
| tree | fc0a7f5d6971cd34c41f30f95658060011cf1f4f /libmysql | |
| parent | ee3bf94cbd001e9a97dfb4ba5ca6e298d91447cf (diff) | |
| download | mariadb-git-759aabf7df936bd8c39d032ca168acc85e60d7b0.tar.gz | |
Fix for bugs #1437, #1446
include/mysql.h:
read_statistic added to virtual methods
libmysql/client_settings.h:
interface for cli_read_statistic added
libmysql/libmysql.c:
read_statistic and mysql_stat code changes
libmysqld/lib_sql.cc:
emb_read_statistic implemented
server_version initialized
sql-common/client.c:
cli_read_statistic added to the table
sql/sql_parse.cc:
storage of result of COM_STATISTIC changed in embedded library
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/client_settings.h | 1 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index d0432503ee9..b9c47c1dd55 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -57,3 +57,4 @@ MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, int STDCALL cli_stmt_execute(MYSQL_STMT *stmt); MYSQL_DATA *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 3efce367cae..0e937a6e0c9 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1102,12 +1102,8 @@ mysql_dump_debug_info(MYSQL *mysql) DBUG_RETURN(simple_command(mysql,COM_DEBUG,0,0,0)); } -const char * STDCALL -mysql_stat(MYSQL *mysql) +const char * STDCALL cli_read_statistic(MYSQL *mysql) { - DBUG_ENTER("mysql_stat"); - if (simple_command(mysql,COM_STATISTICS,0,0,0)) - return mysql->net.last_error; mysql->net.read_pos[mysql->packet_length]=0; /* End of stat string */ if (!mysql->net.read_pos[0]) { @@ -1116,7 +1112,16 @@ mysql_stat(MYSQL *mysql) strmov(mysql->net.last_error, ER(mysql->net.last_errno)); return mysql->net.last_error; } - DBUG_RETURN((char*) mysql->net.read_pos); + return (char*) mysql->net.read_pos; +} + +const char * STDCALL +mysql_stat(MYSQL *mysql) +{ + DBUG_ENTER("mysql_stat"); + if (simple_command(mysql,COM_STATISTICS,0,0,0)) + return mysql->net.last_error; + DBUG_RETURN((*mysql->methods->read_statistic)(mysql)); } |