database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

This is based on the userstatv2 patch from Percona and OurDelta.

Browse Source 
The original code comes, as far as I know, from Google (Mark Callaghan's team) with additional work from Percona, Ourdelta and Weldon Whipple.

This code provides the same functionallity, but with a lot of changes to make it faster and better fit the MariaDB infrastucture.

Added new status variables:
- Com_show_client_statistics, Com_show_index_statistics, Com_show_table_statistics, Com_show_user_statistics
- Access_denied_errors, Busy_time (clock time), Binlog_bytes_written, Cpu_time, Empty_queries, Rows_sent, Rows_read

Added new variable / startup option 'userstat' to control if user statistics should be enabled or not

Added my_getcputime(); Returns cpu time used by this thread.
New FLUSH commands:
- FLUSH SLOW QUERY LOG
- FLUSH TABLE_STATISTICS
- FLUSH INDEX_STATISTICS
- FLUSH USER_STATISTICS
- FLUSH CLIENT_STATISTICS

New SHOW commands:
- SHOW CLIENT_STATISTICS
- SHOW USER_STATISTICS
- SHOW TABLE_STATISTICS
- SHOW INDEX_STATISTICS

New Information schemas:
- CLIENT_STATISTICS
- USER_STATISTICS
- INDEX_STATISTICS
- TABLE_STATISTICS

Added support for all new flush commands to mysqladmin

Added handler::ha_... wrappers for all handler read calls to do statistics counting
- Changed all code to use new ha_... calls
- Count number of read rows, changed rows and rows read trough an index

Added counting of number of bytes sent to binary log (status variable Binlog_bytes_written)
Added counting of access denied errors (status variable Access_denied_erors)

Bugs fixed:
- Fixed bug in add_to_status() and add_diff_to_status() where longlong variables where threated as long
- CLOCK_GETTIME was not propely working on Linuxm

client/mysqladmin.cc:
  Added support for all new flush commmands and some common combinations:
  
  flush-slow-log
  flush-table-statistics
  flush-index-statistics
  flush-user-statistics
  flush-client-statistics
  flush-all-status
  flush-all-statistics
configure.in:
  Added checking if clock_gettime needs the librt.
  (Fixes Bug #37639 clock_gettime is never used/enabled in Linux/Unix)
include/my_sys.h:
  Added my_getcputime()
include/mysql_com.h:
  Added LIST_PROCESS_HOST_LEN & new REFRESH target defines
mysql-test/r/information_schema.result:
  New information schema tables added
mysql-test/r/information_schema_all_engines.result:
  New information schema tables added
mysql-test/r/information_schema_db.result:
  New information schema tables added
mysql-test/r/log_slow.result:
  Added testing that flosh slow query logs is accepted
mysql-test/r/status_user.result:
  Basic testing of user, client, table and index statistics
mysql-test/t/log_slow.test:
  Added testing that flosh slow query logs is accepted
mysql-test/t/status_user-master.opt:
  Ensure that we get a fresh restart before running status_user.test
mysql-test/t/status_user.test:
  Basic testing of user, client, table and index statistics
mysys/my_getsystime.c:
  Added my_getcputime()
  Returns cpu time used by this thread.
sql/authors.h:
  Updated authors to have core and original MySQL developers first.
sql/event_data_objects.cc:
  Updated call to mysql_reset_thd_for_next_command()
sql/event_db_repository.cc:
  Changed to use new ha_... calls
sql/filesort.cc:
  Changed to use new ha_... calls
sql/ha_partition.cc:
  Changed to use new ha_... calls
  Fixed comment syntax
sql/handler.cc:
  Changed to use new ha_... calls
  Reset table statistics
  Added code to update global table and index status
  Added counting of rows changed
sql/handler.h:
  Added table and index statistics variables
  Added function reset_statistics()
  Added handler::ha_... wrappers for all handler read calls to do statistics counting
  Protected all normal read calls to ensure we use the new calls in the server.
  Made ha_partition a friend class so that partition code can call the old read functions
sql/item_subselect.cc:
  Changed to use new ha_... calls
sql/lex.h:
  Added keywords for new information schema tables and flush commands
sql/log.cc:
  Added flush_slow_log()
  Added counting of number of bytes sent to binary log
  Removed not needed test of thd (It's used before, so it's safe to use)
  Added THD object to MYSQL_BIN_LOG::write_cache() to simplify statistics counting
sql/log.h:
  Added new parameter to write_cache()
  Added flush_slow_log() functions.
sql/log_event.cc:
  Updated call to mysql_reset_thd_for_next_command()
  Changed to use new ha_... calls
sql/log_event_old.cc:
  Updated call to mysql_reset_thd_for_next_command()
  Changed to use new ha_... calls
sql/mysql_priv.h:
  Updated call to mysql_reset_thd_for_next_command()
  Added new statistics functions and variables needed by these.
sql/mysqld.cc:
  Added new statistics variables and structures to handle these
  Added new status variables:
  - Com_show_client_statistics, Com_show_index_statistics, Com_show_table_statistics, Com_show_user_statistics
  - Access_denied_errors, Busy_time (clock time), Binlog_bytes_written, Cpu_time, Empty_queries, Rows_set, Rows_read
  Added new option 'userstat' to control if user statistics should be enabled or not
sql/opt_range.cc:
  Changed to use new ha_... calls
sql/opt_range.h:
  Changed to use new ha_... calls
sql/opt_sum.cc:
  Changed to use new ha_... calls
sql/records.cc:
  Changed to use new ha_... calls
sql/set_var.cc:
  Added variable 'userstat'
sql/sp.cc:
  Changed to use new ha_... calls
sql/sql_acl.cc:
  Changed to use new ha_... calls
  Added counting of access_denied_errors
sql/sql_base.cc:
  Added call to statistics functions
sql/sql_class.cc:
  Added usage of org_status_var, to store status variables at start of command
  Added functions THD::update_stats(), THD::update_all_stats()
  Fixed bug in add_to_status() and add_diff_to_status() where longlong variables where threated as long
sql/sql_class.h:
  Added new status variables to status_var
  Moved variables that was not ulong in status_var last.
  Added variables to THD for storing temporary values during statistics counting
sql/sql_connect.cc:
  Variables and functions to calculate user and client statistics
  Added counting of access_denied_errors and lost_connections
sql/sql_cursor.cc:
  Changed to use new ha_... calls
sql/sql_handler.cc:
  Changed to use new ha_... calls
sql/sql_help.cc:
  Changed to use new ha_... calls
sql/sql_insert.cc:
  Changed to use new ha_... calls
sql/sql_lex.h:
  Added SQLCOM_SHOW_USER_STATS, SQLCOM_SHOW_TABLE_STATS, SQLCOM_SHOW_INDEX_STATS, SQLCOM_SHOW_CLIENT_STATS
sql/sql_parse.cc:
  Added handling of:
  - SHOW CLIENT_STATISTICS
  - SHOW USER_STATISTICS
  - SHOW TABLE_STATISTICS
  - SHOW INDEX_STATISTICS
  Added handling of new FLUSH commands:
  - FLUSH SLOW QUERY LOGS
  - FLUSH TABLE_STATISTICS
  - FLUSH INDEX_STATISTICS
  - FLUSH USER_STATISTICS
  - FLUSH CLIENT_STATISTICS
  Added THD parameter to mysql_reset_thd_for_next_command()
  Added initialization and calls to user statistics functions
  Added increment of statistics variables empty_queries, rows_sent and access_denied_errors.
  Added counting of cpu time per query
sql/sql_plugin.cc:
  Changed to use new ha_... calls
sql/sql_prepare.cc:
  Updated call to mysql_reset_thd_for_next_command()
sql/sql_select.cc:
  Changed to use new ha_... calls
  Indentation changes
sql/sql_servers.cc:
  Changed to use new ha_... calls
sql/sql_show.cc:
  Added counting of access denied errors
  Added function for new information schema tables:
  - CLIENT_STATISTICS
  - USER_STATISTICS
  - INDEX_STATISTICS
  - TABLE_STATISTICS
  Changed to use new ha_... calls
sql/sql_table.cc:
  Changed to use new ha_... calls
sql/sql_udf.cc:
  Changed to use new ha_... calls
sql/sql_update.cc:
  Changed to use new ha_... calls
sql/sql_yacc.yy:
  Add new show and flush commands
sql/structs.h:
  Add name_length to KEY to avoid some strlen
  Added cache_name to KEY for fast storage of keyvalue in cache
  Added structs USER_STATS, TABLE_STATS, INDEX_STATS
  Added function prototypes for statistics functions
sql/table.cc:
  Store db+table+index name into keyinfo->cache_name
sql/table.h:
  Added new information schema tables
sql/tztime.cc:
  Changed to use new ha_... calls
This commit is contained in:
Michael Widenius
2009-10-19 20:14:48 +03:00
parent daccf17483
commit ab0905c6d7
58 changed files with 2551 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

481
sql/sql_connect.cc
View File

@@ -20,6 +20,13 @@
#include "mysql_priv.h"
HASH global_user_stats, global_client_stats, global_table_stats;
HASH global_index_stats;
/* Protects the above global stats */
extern pthread_mutex_t LOCK_global_user_client_stats;
extern pthread_mutex_t LOCK_global_table_stats;
extern pthread_mutex_t LOCK_global_index_stats;
#ifdef HAVE_OPENSSL
/*
Without SSL the handshake consists of one packet. This packet
@@ -459,6 +466,7 @@ check_user(THD *thd, enum enum_server_command command,
check_for_max_user_connections(thd, thd->user_connect))
{
/* The error is set in check_for_max_user_connections(). */
status_var_increment(denied_connections);
DBUG_RETURN(1);
}
@@ -470,6 +478,7 @@ check_user(THD *thd, enum enum_server_command command,
/* mysql_change_db() has pushed the error message. */
if (thd->user_connect)
decrease_user_connections(thd->user_connect);
status_var_increment(thd->status_var.access_denied_errors);
DBUG_RETURN(1);
}
}
@@ -493,6 +502,8 @@ check_user(THD *thd, enum enum_server_command command,
thd->main_security_ctx.user,
thd->main_security_ctx.host_or_ip,
passwd_len ? ER(ER_YES) : ER(ER_NO));
status_var_increment(thd->status_var.access_denied_errors);
DBUG_RETURN(1);
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
@@ -520,10 +531,14 @@ extern "C" void free_user(struct user_conn *uc)
void init_max_user_conn(void)
{
#ifndef NO_EMBEDDED_ACCESS_CHECKS
(void) hash_init(&hash_user_connections,system_charset_info,max_connections,
0,0,
(hash_get_key) get_key_conn, (hash_free_key) free_user,
0);
if (hash_init(&hash_user_connections,system_charset_info,max_connections,
0,0,
(hash_get_key) get_key_conn, (hash_free_key) free_user,
0))
{
sql_print_error("Initializing hash_user_connections failed.");
exit(1);
}
#endif
}
@@ -576,6 +591,445 @@ void reset_mqh(LEX_USER *lu, bool get_them= 0)
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
}
/*****************************************************************************
Handle users statistics
*****************************************************************************/
/* 'mysql_system_user' is used for when the user is not defined for a THD. */
static const char mysql_system_user[]= "#mysql_system#";
// Returns 'user' if it's not NULL. Returns 'mysql_system_user' otherwise.
static const char * get_valid_user_string(char* user)
{
return user ? user : mysql_system_user;
}
/*
Returns string as 'IP' for the client-side of the connection represented by
'client'. Does not allocate memory. May return "".
*/
static const char *get_client_host(THD *client)
{
return client->security_ctx->host_or_ip[0] ?
client->security_ctx->host_or_ip :
client->security_ctx->host ? client->security_ctx->host : "";
}
extern "C" uchar *get_key_user_stats(USER_STATS *user_stats, size_t *length,
my_bool not_used __attribute__((unused)))
{
*length= user_stats->user_name_length;
return (uchar*) user_stats->user;
}
void free_user_stats(USER_STATS* user_stats)
{
my_free(user_stats, MYF(0));
}
void init_user_stats(USER_STATS *user_stats,
const char *user,
size_t user_length,
const char *priv_user,
uint total_connections,
uint concurrent_connections,
time_t connected_time,
double busy_time,
double cpu_time,
ulonglong bytes_received,
ulonglong bytes_sent,
ulonglong binlog_bytes_written,
ha_rows rows_sent,
ha_rows rows_read,
ha_rows rows_inserted,
ha_rows rows_deleted,
ha_rows rows_updated,
ulonglong select_commands,
ulonglong update_commands,
ulonglong other_commands,
ulonglong commit_trans,
ulonglong rollback_trans,
ulonglong denied_connections,
ulonglong lost_connections,
ulonglong access_denied_errors,
ulonglong empty_queries)
{
DBUG_ENTER("init_user_stats");
DBUG_PRINT("enter", ("user: %s priv_user: %s", user, priv_user));
user_length= min(user_length, sizeof(user_stats->user)-1);
memcpy(user_stats->user, user, user_length);
user_stats->user[user_length]= 0;
user_stats->user_name_length= user_length;
strmake(user_stats->priv_user, priv_user, sizeof(user_stats->priv_user)-1);
user_stats->total_connections= total_connections;
user_stats->concurrent_connections= concurrent_connections;
user_stats->connected_time= connected_time;
user_stats->busy_time= busy_time;
user_stats->cpu_time= cpu_time;
user_stats->bytes_received= bytes_received;
user_stats->bytes_sent= bytes_sent;
user_stats->binlog_bytes_written= binlog_bytes_written;
user_stats->rows_sent= rows_sent;
user_stats->rows_updated= rows_updated;
user_stats->rows_read= rows_read;
user_stats->select_commands= select_commands;
user_stats->update_commands= update_commands;
user_stats->other_commands= other_commands;
user_stats->commit_trans= commit_trans;
user_stats->rollback_trans= rollback_trans;
user_stats->denied_connections= denied_connections;
user_stats->lost_connections= lost_connections;
user_stats->access_denied_errors= access_denied_errors;
user_stats->empty_queries= empty_queries;
DBUG_VOID_RETURN;
}
#ifdef COMPLEAT_PATCH_NOT_ADDED_YET
void add_user_stats(USER_STATS *user_stats,
uint total_connections,
uint concurrent_connections,
time_t connected_time,
double busy_time,
double cpu_time,
ulonglong bytes_received,
ulonglong bytes_sent,
ulonglong binlog_bytes_written,
ha_rows rows_sent,
ha_rows rows_read,
ha_rows rows_inserted,
ha_rows rows_deleted,
ha_rows rows_updated,
ulonglong select_commands,
ulonglong update_commands,
ulonglong other_commands,
ulonglong commit_trans,
ulonglong rollback_trans,
ulonglong denied_connections,
ulonglong lost_connections,
ulonglong access_denied_errors,
ulonglong empty_queries)
{
user_stats->total_connections+= total_connections;
user_stats->concurrent_connections+= concurrent_connections;
user_stats->connected_time+= connected_time;
user_stats->busy_time+= busy_time;
user_stats->cpu_time+= cpu_time;
user_stats->bytes_received+= bytes_received;
user_stats->bytes_sent+= bytes_sent;
user_stats->binlog_bytes_written+= binlog_bytes_written;
user_stats->rows_sent+= rows_sent;
user_stats->rows_inserted+= rows_inserted;
user_stats->rows_deleted+= rows_deleted;
user_stats->rows_updated+= rows_updated;
user_stats->rows_read+= rows_read;
user_stats->select_commands+= select_commands;
user_stats->update_commands+= update_commands;
user_stats->other_commands+= other_commands;
user_stats->commit_trans+= commit_trans;
user_stats->rollback_trans+= rollback_trans;
user_stats->denied_connections+= denied_connections;
user_stats->lost_connections+= lost_connections;
user_stats->access_denied_errors+= access_denied_errors;
user_stats->empty_queries+= empty_queries;
}
#endif
void init_global_user_stats(void)
{
if (hash_init(&global_user_stats, system_charset_info, max_connections,
0, 0, (hash_get_key) get_key_user_stats,
(hash_free_key)free_user_stats, 0))
{
sql_print_error("Initializing global_user_stats failed.");
exit(1);
}
}
void init_global_client_stats(void)
{
if (hash_init(&global_client_stats, system_charset_info, max_connections,
0, 0, (hash_get_key) get_key_user_stats,
(hash_free_key)free_user_stats, 0))
{
sql_print_error("Initializing global_client_stats failed.");
exit(1);
}
}
extern "C" uchar *get_key_table_stats(TABLE_STATS *table_stats, size_t *length,
my_bool not_used __attribute__((unused)))
{
*length= table_stats->table_name_length;
return (uchar*) table_stats->table;
}
extern "C" void free_table_stats(TABLE_STATS* table_stats)
{
my_free(table_stats, MYF(0));
}
void init_global_table_stats(void)
{
if (hash_init(&global_table_stats, system_charset_info, max_connections,
0, 0, (hash_get_key) get_key_table_stats,
(hash_free_key)free_table_stats, 0)) {
sql_print_error("Initializing global_table_stats failed.");
exit(1);
}
}
extern "C" uchar *get_key_index_stats(INDEX_STATS *index_stats, size_t *length,
my_bool not_used __attribute__((unused)))
{
*length= index_stats->index_name_length;
return (uchar*) index_stats->index;
}
extern "C" void free_index_stats(INDEX_STATS* index_stats)
{
my_free(index_stats, MYF(0));
}
void init_global_index_stats(void)
{
if (hash_init(&global_index_stats, system_charset_info, max_connections,
0, 0, (hash_get_key) get_key_index_stats,
(hash_free_key)free_index_stats, 0))
{
sql_print_error("Initializing global_index_stats failed.");
exit(1);
}
}
void free_global_user_stats(void)
{
hash_free(&global_user_stats);
}
void free_global_table_stats(void)
{
hash_free(&global_table_stats);
}
void free_global_index_stats(void)
{
hash_free(&global_index_stats);
}
void free_global_client_stats(void)
{
hash_free(&global_client_stats);
}
/*
Increments the global stats connection count for an entry from
global_client_stats or global_user_stats. Returns 0 on success
and 1 on error.
*/
static bool increment_count_by_name(const char *name, size_t name_length,
const char *role_name,
HASH *users_or_clients, THD *thd)
{
USER_STATS *user_stats;
if (!(user_stats= (USER_STATS*) hash_search(users_or_clients, (uchar*) name,
name_length)))
{
/* First connection for this user or client */
if (!(user_stats= ((USER_STATS*)
my_malloc(sizeof(USER_STATS),
MYF(MY_WME | MY_ZEROFILL)))))
return TRUE; // Out of memory
init_user_stats(user_stats, name, name_length, role_name,
0, 0, // connections
0, 0, 0, // time
0, 0, 0, // bytes sent, received and written
0, 0, // Rows sent and read
0, 0, 0, // rows inserted, deleted and updated
0, 0, 0, // select, update and other commands
0, 0, // commit and rollback trans
thd->status_var.access_denied_errors,
0, // lost connections
0, // access denied errors
0); // empty queries
if (my_hash_insert(users_or_clients, (uchar*)user_stats))
{
my_free(user_stats, 0);
return TRUE; // Out of memory
}
}
user_stats->total_connections++;
return FALSE;
}
/*
Increments the global user and client stats connection count.
@param use_lock if true, LOCK_global_user_client_stats will be locked
@retval 0 ok
@retval 1 error.
*/
#ifndef EMBEDDED_LIBRARY
static bool increment_connection_count(THD* thd, bool use_lock)
{
const char *user_string= get_valid_user_string(thd->main_security_ctx.user);
const char *client_string= get_client_host(thd);
bool return_value= FALSE;
if (!thd->userstat_running)
return FALSE;
if (use_lock)
pthread_mutex_lock(&LOCK_global_user_client_stats);
if (increment_count_by_name(user_string, strlen(user_string), user_string,
&global_user_stats, thd))
{
return_value= TRUE;
goto end;
}
if (increment_count_by_name(client_string, strlen(client_string),
user_string, &global_client_stats, thd))
{
return_value= TRUE;
goto end;
}
end:
if (use_lock)
pthread_mutex_unlock(&LOCK_global_user_client_stats);
return return_value;
}
#endif
/*
Used to update the global user and client stats
*/
static void update_global_user_stats_with_user(THD *thd,
USER_STATS *user_stats,
time_t now)
{
DBUG_ASSERT(thd->userstat_running);
user_stats->connected_time+= now - thd->last_global_update_time;
user_stats->busy_time+= (thd->status_var.busy_time -
thd->org_status_var.busy_time);
user_stats->cpu_time+= (thd->status_var.cpu_time -
thd->org_status_var.cpu_time);
/*
This is handle specially as bytes_recieved is incremented BEFORE
org_status_var is copied.
*/
user_stats->bytes_received+= (thd->org_status_var.bytes_received-
thd->start_bytes_received);
user_stats->bytes_sent+= (thd->status_var.bytes_sent -
thd->org_status_var.bytes_sent);
user_stats->binlog_bytes_written+=
(thd->status_var.binlog_bytes_written -
thd->org_status_var.binlog_bytes_written);
user_stats->rows_read+= (thd->status_var.rows_read -
thd->org_status_var.rows_read);
user_stats->rows_sent+= (thd->status_var.rows_sent -
thd->org_status_var.rows_sent);
user_stats->rows_inserted+= (thd->status_var.ha_write_count -
thd->org_status_var.ha_write_count);
user_stats->rows_deleted+= (thd->status_var.ha_delete_count -
thd->org_status_var.ha_delete_count);
user_stats->rows_updated+= (thd->status_var.ha_update_count -
thd->org_status_var.ha_update_count);
user_stats->select_commands+= thd->select_commands;
user_stats->update_commands+= thd->update_commands;
user_stats->other_commands+= thd->other_commands;
user_stats->commit_trans+= (thd->status_var.ha_commit_count -
thd->org_status_var.ha_commit_count);
user_stats->rollback_trans+= (thd->status_var.ha_rollback_count +
thd->status_var.ha_savepoint_rollback_count -
thd->org_status_var.ha_rollback_count -
thd->org_status_var.
ha_savepoint_rollback_count);
user_stats->access_denied_errors+=
(thd->status_var.access_denied_errors -
thd->org_status_var.access_denied_errors);
user_stats->empty_queries+= (thd->status_var.empty_queries -
thd->org_status_var.empty_queries);
/* The following can only contain 0 or 1 and then connection ends */
user_stats->denied_connections+= thd->status_var.access_denied_errors;
user_stats->lost_connections+= thd->status_var.lost_connections;
}
/* Updates the global stats of a user or client */
void update_global_user_stats(THD *thd, bool create_user, time_t now)
{
const char *user_string, *client_string;
USER_STATS *user_stats;
size_t user_string_length, client_string_length;
DBUG_ASSERT(thd->userstat_running);
user_string= get_valid_user_string(thd->main_security_ctx.user);
user_string_length= strlen(user_string);
client_string= get_client_host(thd);
client_string_length= strlen(client_string);
pthread_mutex_lock(&LOCK_global_user_client_stats);
// Update by user name
if ((user_stats= (USER_STATS*) hash_search(&global_user_stats,
(uchar*) user_string,
user_string_length)))
{
/* Found user. */
update_global_user_stats_with_user(thd, user_stats, now);
}
else
{
/* Create the entry */
if (create_user)
{
increment_count_by_name(user_string, user_string_length, user_string,
&global_user_stats, thd);
}
}
/* Update by client IP */
if ((user_stats= (USER_STATS*)hash_search(&global_client_stats,
(uchar*) client_string,
client_string_length)))
{
// Found by client IP
update_global_user_stats_with_user(thd, user_stats, now);
}
else
{
// Create the entry
if (create_user)
{
increment_count_by_name(client_string, client_string_length,
user_string, &global_client_stats, thd);
}
}
/* Reset variables only used for counting */
thd->select_commands= thd->update_commands= thd->other_commands= 0;
thd->last_global_update_time= now;
pthread_mutex_unlock(&LOCK_global_user_client_stats);
}
void thd_init_client_charset(THD *thd, uint cs_number)
{
@@ -970,6 +1424,14 @@ bool login_connection(THD *thd)
/* Connect completed, set read/write timeouts back to default */
my_net_set_read_timeout(net, thd->variables.net_read_timeout);
my_net_set_write_timeout(net, thd->variables.net_write_timeout);
/* Updates global user connection stats. */
if (increment_connection_count(thd, TRUE))
{
net_send_error(thd, ER_OUTOFMEMORY); // Out of memory
DBUG_RETURN(1);
}
DBUG_RETURN(0);
}
@@ -991,6 +1453,7 @@ void end_connection(THD *thd)
if (thd->killed || (net->error && net->vio != 0))
{
statistic_increment(aborted_threads,&LOCK_status);
status_var_increment(thd->status_var.lost_connections);
}
if (net->error && net->vio != 0)
@@ -1117,10 +1580,14 @@ pthread_handler_t handle_one_connection(void *arg)
for (;;)
{
NET *net= &thd->net;
bool create_user= TRUE;
lex_start(thd);
if (login_connection(thd))
{
create_user= FALSE;
goto end_thread;
}
prepare_new_connection_state(thd);
@@ -1134,12 +1601,14 @@ pthread_handler_t handle_one_connection(void *arg)
end_thread:
close_connection(thd, 0, 1);
if (thd->userstat_running)
update_global_user_stats(thd, create_user, time(NULL));
if (thd->scheduler->end_thread(thd,1))
return 0; // Probably no-threads
/*
If end_thread() returns, we are either running with
thread-handler=no-threads or this thread has been schedule to
If end_thread() returns, this thread has been schedule to
handle the next connection.
*/
thd= current_thd;