MDEV 4427: query timeouts

Added MAX_STATEMENT_TIME user variable to automaticly kill queries after a given time limit has expired.

- Added timer functions based on pthread_cond_timedwait
- Added kill_handlerton() to signal storage engines about kill/timeout
- Added support for GRANT ... MAX_STATEMENT_TIME=#
- Copy max_statement_time to current user, if stored in mysql.user
- Added status variable max_statement_time_exceeded
- Added KILL_TIMEOUT
- Removed digest hash from performance schema tests as they change all the time.
- Updated test results that changed because of the new user variables or new fields in mysql.user

This functionallity is inspired by work done by Davi Arnaut at twitter.
Test case is copied from Davi's work.

Documentation can be found at
https://kb.askmonty.org/en/how-to-limittimeout-queries/

mysql-test/r/mysqld--help.result:
  Updated for new help message
mysql-test/suite/perfschema/r/all_instances.result:
  Added new mutex
mysql-test/suite/sys_vars/r/max_statement_time_basic.result:
  Added testing of max_statement_time
mysql-test/suite/sys_vars/t/max_statement_time_basic.test:
  Added testing of max_statement_time
mysql-test/t/max_statement_time.test:
  Added testing of max_statement_time
mysys/CMakeLists.txt:
  Added thr_timer
mysys/my_init.c:
mysys/mysys_priv.h:
  Added new mutex and condition variables
  Added new mutex and condition variables
mysys/thr_timer.c:
  Added timer functions based on pthread_cond_timedwait()
  This can be compiled with HAVE_TIMER_CREATE to benchmark agains timer_create()/timer_settime()
sql/lex.h:
  Added MAX_STATEMENT_TIME
sql/log_event.cc:
  Safety fix (timeout should be threated as an interrupted query)
sql/mysqld.cc:
  Added support for timers
  Added status variable max_statement_time_exceeded
sql/share/errmsg-utf8.txt:
  Added ER_QUERY_TIMEOUT
sql/signal_handler.cc:
  Added support for KILL_TIMEOUT
sql/sql_acl.cc:
  Added support for GRANT ... MAX_STATEMENT_TIME=#
  Copy max_statement_time to current user
sql/sql_class.cc:
  Added timer functionality to THD.
  Added thd_kill_timeout()
sql/sql_class.h:
  Added timer functionality to THD.
  Added KILL_TIMEOUT
  Added max_statement_time variable in similar manner as long_query_time was done.
sql/sql_connect.cc:
  Added handling of max_statement_time_exceeded
sql/sql_parse.cc:
  Added starting and stopping timers for queries.
sql/sql_show.cc:
  Added max_statement_time_exceeded for user/connects status in MariaDB 10.0
sql/sql_yacc.yy:
  Added support for GRANT ... MAX_STATEMENT_TIME=# syntax, to be enabled in 10.0
sql/structs.h:
  Added max_statement_time user resource
sql/sys_vars.cc:
  Added max_statement_time variables
mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
  Removed test as we require all fields in mysql.user table.
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
  Updated mysql.user with new max_statement_time field

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 0065edcc14d..89a90f41697 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -101,7 +101,6 @@ int get_or_create_user_conn(THD *thd, const char *user,
 end:
   mysql_mutex_unlock(&LOCK_user_conn);
   return return_val;
-
 }
 
 
@@ -437,6 +436,7 @@ void init_user_stats(USER_STATS *user_stats,
                      ulonglong rollback_trans,
                      ulonglong denied_connections,
                      ulonglong lost_connections,
+                     ulonglong max_statement_time_exceeded,
                      ulonglong access_denied_errors,
                      ulonglong empty_queries)
 {
@@ -467,6 +467,7 @@ void init_user_stats(USER_STATS *user_stats,
   user_stats->rollback_trans= rollback_trans;
   user_stats->denied_connections= denied_connections;
   user_stats->lost_connections= lost_connections;
+  user_stats->max_statement_time_exceeded= max_statement_time_exceeded;
   user_stats->access_denied_errors= access_denied_errors;
   user_stats->empty_queries= empty_queries;
   DBUG_VOID_RETURN;
@@ -496,6 +497,7 @@ void add_user_stats(USER_STATS *user_stats,
                     ulonglong rollback_trans,
                     ulonglong denied_connections,
                     ulonglong lost_connections,
+                    ulonglong max_statement_time_exceeded,
                     ulonglong access_denied_errors,
                     ulonglong empty_queries)
 {
@@ -519,6 +521,7 @@ void add_user_stats(USER_STATS *user_stats,
   user_stats->rollback_trans+= rollback_trans;
   user_stats->denied_connections+= denied_connections;
   user_stats->lost_connections+= lost_connections;
+  user_stats->max_statement_time_exceeded+= max_statement_time_exceeded;
   user_stats->access_denied_errors+= access_denied_errors;
   user_stats->empty_queries+= empty_queries;
 }
@@ -644,6 +647,7 @@ static bool increment_count_by_name(const char *name, size_t name_length,
                     0, 0,      // commit and rollback trans
                     thd->status_var.access_denied_errors,
                     0,         // lost connections
+                    0,         // max query timeouts
                     0,         // access denied errors
                     0);        // empty queries
 
@@ -756,6 +760,7 @@ static void update_global_user_stats_with_user(THD *thd,
   /* 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;
+  user_stats->max_statement_time_exceeded+= thd->status_var.max_statement_time_exceeded;
 }