Merge lp:~vlad-lesin/percona-server/5.6-sql_timeout_twitter into lp:percona-server/5.6

[Vlad Lesin]

The implementation of this https://blueprints.launchpad.net/percona-server/+spec/port-max-statement-time blueprint.

Jenkins: http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/32/

[Sergei Glushchenko (sergei.glushchenko)]

Vlad,

I see you encountered same issue as I did also. performance_schema *digest* tables are rely heavily on sql_yacc.yy grammar. So if someone just add new token (or even rule?) many of statement's digests will change.

I very dislike it as
1. There is a need to almost completely rewrite several *.result in perfscehma suite
2. There is no way to merge for example this branch and lp:~sergei.glushchenko/percona-server/ps56-univ-log-archive as both touch sql_yacc.yy. As resulting MD5 hashes will depend on changes made in both branches. The only possible way is once one of the branges been merged, update another one and recalculate digests in test cases.

Do you have any thoughts on how to workaround this?

Thanks,
Sergei

[Sergei Glushchenko (sergei.glushchenko)]

Vlad,
Some minor comments:

lines 2279-2280 redundant change
likewise 2585
likewise 3023

in have_statement_timeout_basic.test
it has been said that error 'Readonly variable' is expected but what really
is expected is the 'Unknown column 'have_statement_timeout' in 'field list''
error and it is raised as well.

[Sergei Glushchenko (sergei.glushchenko)]

review: Needs Fixing (g2)

[Vlad Lesin (vlad-lesin)]

> I see you encountered same issue as I did also. performance_schema *digest*
> tables are rely heavily on sql_yacc.yy grammar. So if someone just add new
> token (or even rule?) many of statement's digests will change.
...
> Do you have any thoughts on how to workaround this?

Digest calculation is based on token IDs. So every time we add new token in the middle of tokens list we just shift token IDs that are after just inserted token. So I see two variants how to avoid that. The first is add new tokens at the end of the list. The second - calculate digest using text representation of query instead of set of tokens.

[Sergei Glushchenko (sergei.glushchenko)]

First option obviously wouldn't work because there are additional PFS-specific tokens which are generated automatically (in gen_pfs_lex_token.cc) with IDs starting from max last token seen.

Maybe it isn't that bad to update test cases with new digests. I just wondering why that method of digest calculation has been chosen. Probably nobody should refer to digests in their scripts/applications/etc, and they are needed only for internal purposes.

[Vlad Lesin (vlad-lesin)]

> Vlad,
> Some minor comments:
>
> lines 2279-2280 redundant change
> likewise 2585
> likewise 3023
>
> in have_statement_timeout_basic.test
> it has been said that error 'Readonly variable' is expected but what really
> is expected is the 'Unknown column 'have_statement_timeout' in 'field list''
> error and it is raised as well.

Fixed.

[Vlad Lesin (vlad-lesin)]

> Maybe it isn't that bad to update test cases with new digests. I just
> wondering why that method of digest calculation has been chosen. Probably
> nobody should refer to digests in their scripts/applications/etc, and they are
> needed only for internal purposes.

It can lead to issues during merging. If several people make MP with updated tests merge captain should update that test results manually. But I think we can do nothing with it. We can't make rules for test scripts as we work with upstream code.

[Vlad Lesin (vlad-lesin)]

Now it is rebased to new code.

Jenkins: http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/209/

[Alexey Kopytov (akopytov)]

Vlad,

  - do we really need the following change?

-#if !defined(__cplusplus) && !defined(bool)
-#define bool In_C_you_should_use_my_bool_instead()
-#endif
+#include <stdbool.h>

    The intention was to allow using C99 'bool' in C code (and break
    Windows compatibility), but I don't see any occurrences of such
    usage?

  - my_os_timer_* to avoid name clash with existing my_timer_init()

  - I'm having second thoughts on per-user MAX_STATEMENT_TIME limit
    after reviewing the code. It feels like it's going to be a pain to
    support and maintain. Let's remove it? It's a "nice to have" thing, but
    it was not a requirement for us originally, and would also
    unproportionally complicate migrations to/from upstream MySQL.

  - was there any specific reason to implement your own set of
    regression tests instead of porting them from the Twitter tree? Most
    of their tests use the SELECT hint that we chose not to implement,
    but those could be converted to SET ...; SELECT ... form.

  - include my_global.h and use DBUG_ASSERT() instead of assert()? Also
    don't include assert.h, errno.h and string.h?

  - unnecessary change:

@@ -4254,6 +4284,7 @@ static int replace_column_table(GRANT_TA
         goto end;
       }
     }
+
   }

   /*

  - remnant from SELECT hints implementation that is also unnecessary:

--- Percona-Server/sql/sql_lex.h 2013-06-27 15:15:35 +0000
+++ Percona-Server/sql/sql_lex.h 2013-08-06 11:40:36 +0000
@@ -2533,6 +2533,9 @@ struct LEX: public Query_tables_list

   class Explain_format *explain_format;

+ /** Maximum execution time for a statement. */
+ ulong max_statement_time;
+
   LEX();

   virtual ~LEX()

  - I would restructure get_max_statement_time() / set_statement_timer()
    a bit for performance reasons. We should first check if we do have
    some timeout defined (i.e. thd->variables.max_statement_time > 0)
    and then check other conditions. So that we do as less work as
    possible when timeouts are not used. likely()/unlikely() and
    explicit "inline" hints can also make a big difference.

  - can you explain changed in ha_innodb.cc? It looks like fixing a
    problem in the wrong place, i.e. implementing a workaround of
    thread_pool_priv.h defining MYSQL_SERVER unconditionally.

  - innobase_kill_connection() needs comments

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> Vlad,
>
> - do we really need the following change?
>
> -#if !defined(__cplusplus) && !defined(bool)
> -#define bool In_C_you_should_use_my_bool_instead()
> -#endif
> +#include <stdbool.h>
>
> The intention was to allow using C99 'bool' in C code (and break
> Windows compatibility), but I don't see any occurrences of such
> usage?
>
Removed.

> - my_os_timer_* to avoid name clash with existing my_timer_init()
>
Done.

> - I'm having second thoughts on per-user MAX_STATEMENT_TIME limit
> after reviewing the code. It feels like it's going to be a pain to
> support and maintain. Let's remove it? It's a "nice to have" thing, but
> it was not a requirement for us originally, and would also
> unproportionally complicate migrations to/from upstream MySQL.
>
Removed.

> - was there any specific reason to implement your own set of
> regression tests instead of porting them from the Twitter tree? Most
> of their tests use the SELECT hint that we chose not to implement,
> but those could be converted to SET ...; SELECT ... form.
All tests are ported from Twitter tree except these two:
mysql-test/suite/randgen/t/max_statement_time.test
mysql-test/t/max_statement_time.test

The first one is not ported because I did not find randgen grammar files for the test
in the tree. The second one repeats the mysql-test/t/max_statement_time_func.test test
but uses statement timeout set instead of set with variable.

>
> - include my_global.h and use DBUG_ASSERT() instead of assert()? Also
> don't include assert.h, errno.h and string.h?
As we do not support BSD-based platforms and do not test code for such platforms with our
regression tests system the BSD-based platform specific files are kept as is.

> - unnecessary change:
>
> @@ -4254,6 +4284,7 @@ static int replace_column_table(GRANT_TA
> goto end;
> }
> }
> +
> }
>
> /*
>
> - remnant from SELECT hints implementation that is also unnecessary:
>
> --- Percona-Server/sql/sql_lex.h 2013-06-27 15:15:35 +0000
> +++ Percona-Server/sql/sql_lex.h 2013-08-06 11:40:36 +0000
> @@ -2533,6 +2533,9 @@ struct LEX: public Query_tables_list
>
> class Explain_format *explain_format;
>
> + /** Maximum execution time for a statement. */
> + ulong max_statement_time;
> +
> LEX();
>
> virtual ~LEX()
>
As per-user MAX_STATEMENT_TIME limit code is removed the above changes are removed too.

> - I would restructure get_max_statement_time() / set_statement_timer()
> a bit for performance reasons. We should first check if we do have
> some timeout defined (i.e. thd->variables.max_statement_time > 0)
> and then check other conditions. So that we do as less work as
> possible when timeouts are not used. likely()/unlikely() and
> explicit "inline" hints can also make a big difference.
>
Done.

> - can you explain changed in ha_innodb.cc? It looks like fixing a
> problem in the wrong place, i.e. implementing a workaround of
> thread_pool_priv.h defining MYSQL_SERVER unconditionally.
Made conditional #define in thread_pool_priv.h

> - innobase_kill_connection() needs comments
Done.

h...

[Alexey Kopytov (akopytov)]

review: Approve

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/290/

=== modified file 'Percona-Server/config.h.cmake'
--- Percona-Server/config.h.cmake	2013-06-20 15:16:00 +0000
+++ Percona-Server/config.h.cmake	2013-09-09 15:30:42 +0000
@@ -306,6 +306,10 @@
 #cmakedefine STRUCT_DIRENT_HAS_D_NAMLEN 1
 #cmakedefine SPRINTF_RETURNS_INT 1
 
+#cmakedefine HAVE_POSIX_TIMERS 1
+#cmakedefine HAVE_KQUEUE_TIMERS 1
+#cmakedefine HAVE_MY_TIMER 1
+
 #cmakedefine DNS_USE_CPU_CLOCK_FOR_ID 1
 #cmakedefine HAVE_EPOLL 1
 #cmakedefine HAVE_EPOLL_CTL 1

=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2013-08-14 03:57:21 +0000
+++ Percona-Server/configure.cmake	2013-09-09 15:30:42 +0000
@@ -197,6 +197,7 @@
   IF(NOT LIBRT)
     MY_SEARCH_LIBS(clock_gettime rt LIBRT)
   ENDIF()
+  MY_SEARCH_LIBS(timer_create rt LIBRT)
   FIND_PACKAGE(Threads)
 
   SET(CMAKE_REQUIRED_LIBRARIES 
@@ -523,6 +524,10 @@
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 CHECK_FUNCTION_EXISTS (ntohll HAVE_HTONLL)
 
+CHECK_FUNCTION_EXISTS (timer_create HAVE_TIMER_CREATE)
+CHECK_FUNCTION_EXISTS (timer_settime HAVE_TIMER_SETTIME)
+CHECK_FUNCTION_EXISTS (kqueue HAVE_KQUEUE)
+
 CHECK_FUNCTION_EXISTS (clock_gettime DNS_USE_CPU_CLOCK_FOR_ID)
 CHECK_FUNCTION_EXISTS (epoll_create HAVE_EPOLL)
 CHECK_FUNCTION_EXISTS (epoll_ctl HAVE_EPOLL_CTL)
@@ -579,6 +584,8 @@
 CHECK_SYMBOL_EXISTS(TIOCSTAT "sys/ioctl.h" TIOCSTAT_IN_SYS_IOCTL)
 CHECK_SYMBOL_EXISTS(FIONREAD "sys/filio.h" FIONREAD_IN_SYS_FILIO)
 CHECK_SYMBOL_EXISTS(gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY)
+CHECK_SYMBOL_EXISTS(SIGEV_THREAD_ID "signal.h;time.h" HAVE_SIGEV_THREAD_ID)
+CHECK_SYMBOL_EXISTS(EVFILT_TIMER "sys/types.h;sys/event.h;sys/time.h" HAVE_EVFILT_TIMER)
 
 CHECK_SYMBOL_EXISTS(finite  "math.h" HAVE_FINITE_IN_MATH_H)
 IF(HAVE_FINITE_IN_MATH_H)
@@ -607,7 +614,18 @@
   return 0;
 }" HAVE_FESETROUND)
 
-
+# Check for the Linux-specific POSIX timers API.
+IF(HAVE_TIMER_CREATE AND HAVE_TIMER_SETTIME AND HAVE_SIGEV_THREAD_ID)
+  SET(HAVE_POSIX_TIMERS 1 CACHE INTERNAL "Have POSIX timer-related functions")
+ENDIF()
+
+IF(HAVE_KQUEUE AND HAVE_EVFILT_TIMER)
+  SET(HAVE_KQUEUE_TIMERS 1 CACHE INTERNAL "Have kqueue timer-related filter")
+ENDIF()
+
+IF(HAVE_POSIX_TIMERS OR HAVE_KQUEUE_TIMERS)
+  SET(HAVE_MY_TIMER 1 CACHE INTERNAL "Have mysys timer-related functions")
+ENDIF()
 
 #
 # Test for endianess

=== modified file 'Percona-Server/include/my_global.h'
--- Percona-Server/include/my_global.h	2013-06-26 14:15:01 +0000
+++ Percona-Server/include/my_global.h	2013-09-09 15:30:42 +0000
@@ -363,6 +363,19 @@
 #include <crypt.h>
 #endif
 
+/**
+  Cast a member of a structure to the structure that contains it.
+
+  @param  ptr     Pointer to the member.
+  @param  type    Type of the structure that contains the member.
+  @param  member  Name of the member within the structure.
+*/
+#define my_container_of(ptr, type, member)              \
+  ({                                                    \
+    const typeof(((type *)0)->member) *__mptr= (ptr);   \
+    (type *)((char *)__mptr - offsetof(type, member));  \
+  })
+
 /*
   A lot of our programs uses asserts, so better to always include it
   This also fixes a problem when people uses DBUG_ASSERT without including

=== added file 'Percona-Server/include/my_timer.h'
--- Percona-Server/include/my_timer.h	1970-01-01 00:00:00 +0000
+++ Percona-Server/include/my_timer.h	2013-09-09 15:30:42 +0000
@@ -0,0 +1,69 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#ifndef MY_TIMER_H
+#define MY_TIMER_H
+
+#include "my_global.h"    /* C_MODE_START, C_MODE_END */
+#include "my_config.h"    /* HAVE_*_TIMERS */
+
+/* POSIX timers API. */
+#ifdef HAVE_POSIX_TIMERS
+# include <time.h>  /* timer_t */
+  typedef timer_t   os_timer_t;
+#elif HAVE_KQUEUE_TIMERS
+# include <sys/types.h> /* uintptr_t */
+  typedef uintptr_t os_timer_t;
+#endif
+
+/* Whether timer API is implemented. */
+#ifdef HAVE_MY_TIMER
+
+C_MODE_START
+
+typedef struct st_my_timer my_timer_t;
+
+/** Non-copyable timer object. */
+struct st_my_timer
+{
+  /** Timer ID used to identify the timer in timer requests. */
+  os_timer_t id;
+
+  /** Timer expiration notification function. */
+  void (*notify_function)(my_timer_t *);
+};
+
+/* Initialize internal components. */
+int my_os_timer_init_ext(void);
+
+/* Release any resources acquired. */
+void my_os_timer_deinit(void);
+
+/* Create a timer object. */
+int my_os_timer_create(my_timer_t *timer);
+
+/* Set the time (in milliseconds) until the next expiration of the timer. */
+int my_os_timer_set(my_timer_t *timer, unsigned long time);
+
+/* Reset the time until the next expiration of the timer. */
+int my_os_timer_reset(my_timer_t *timer, int *state);
+
+/* Delete a timer object. */
+void my_os_timer_delete(my_timer_t *timer);
+
+C_MODE_END
+
+#endif /* HAVE_MY_TIMER */
+#endif /* MY_TIMER_H */

=== modified file 'Percona-Server/include/mysql/plugin.h'
--- Percona-Server/include/mysql/plugin.h	2013-08-06 15:16:34 +0000
+++ Percona-Server/include/mysql/plugin.h	2013-09-09 15:30:42 +0000
@@ -627,6 +627,13 @@
                     unsigned long long *pos_var);
 
 /**
+  Set the killed status of the current statement.
+
+  @param thd  user thread connection handle
+*/
+void thd_set_kill_status(const MYSQL_THD thd);
+
+/**
   Return the thread id of a user thread
 
   @param thd  user thread connection handle

=== modified file 'Percona-Server/include/mysql/plugin_audit.h.pp'
--- Percona-Server/include/mysql/plugin_audit.h.pp	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/mysql/plugin_audit.h.pp	2013-09-09 15:30:42 +0000
@@ -249,6 +249,7 @@
 void thd_binlog_pos(const void* thd,
                     const char **file_var,
                     unsigned long long *pos_var);
+void thd_set_kill_status(const void* thd);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);
 void mysql_query_cache_invalidate4(void* thd,

=== modified file 'Percona-Server/include/mysql/plugin_auth.h.pp'
--- Percona-Server/include/mysql/plugin_auth.h.pp	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/mysql/plugin_auth.h.pp	2013-09-09 15:30:42 +0000
@@ -249,6 +249,7 @@
 void thd_binlog_pos(const void* thd,
                     const char **file_var,
                     unsigned long long *pos_var);
+void thd_set_kill_status(const void* thd);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);
 void mysql_query_cache_invalidate4(void* thd,

=== modified file 'Percona-Server/include/mysql/plugin_ftparser.h.pp'
--- Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/mysql/plugin_ftparser.h.pp	2013-09-09 15:30:42 +0000
@@ -202,6 +202,7 @@
 void thd_binlog_pos(const void* thd,
                     const char **file_var,
                     unsigned long long *pos_var);
+void thd_set_kill_status(const void* thd);
 unsigned long thd_get_thread_id(const void* thd);
 void thd_get_xid(const void* thd, MYSQL_XID *xid);
 void mysql_query_cache_invalidate4(void* thd,

=== modified file 'Percona-Server/include/mysql/thread_pool_priv.h'
--- Percona-Server/include/mysql/thread_pool_priv.h	2013-05-12 06:24:46 +0000
+++ Percona-Server/include/mysql/thread_pool_priv.h	2013-09-09 15:30:42 +0000
@@ -30,7 +30,13 @@
   to include sql_profile.h and table.h.
 */
 #include <mysqld_error.h> /* To get ER_ERROR_ON_READ */
+/*
+  MYSQL_SERVER can be defined before including this header, check it to avoid
+  compilation error.
+*/
+#ifndef MYSQL_SERVER
 #define MYSQL_SERVER 1
+#endif //MYSQL_SERVER
 #include <scheduler.h>
 #include <debug_sync.h>
 #include <sql_profile.h>

=== modified file 'Percona-Server/libmysqld/CMakeLists.txt'
--- Percona-Server/libmysqld/CMakeLists.txt	2012-10-16 06:21:51 +0000
+++ Percona-Server/libmysqld/CMakeLists.txt	2013-09-09 15:30:42 +0000
@@ -78,6 +78,9 @@
   ${IMPORTED_SOURCES}
 )
 
+IF(HAVE_MY_TIMER)
+  SET(SQL_EMBEDDED_SOURCES ${SQL_EMBEDDED_SOURCES} ../sql/sql_timer.cc)
+ENDIF()
 
 ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
 DTRACE_INSTRUMENT(sql_embedded)

=== added file 'Percona-Server/mysql-test/include/have_statement_timeout.inc'
--- Percona-Server/mysql-test/include/have_statement_timeout.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/have_statement_timeout.inc	2013-09-09 15:30:42 +0000
@@ -0,0 +1,4 @@
+-- require r/have_statement_timeout.require
+disable_query_log;
+show variables like 'have_statement_timeout';
+enable_query_log;

=== added file 'Percona-Server/mysql-test/r/have_statement_timeout.require'
--- Percona-Server/mysql-test/r/have_statement_timeout.require	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/have_statement_timeout.require	2013-09-09 15:30:42 +0000
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_statement_timeout	YES

=== added file 'Percona-Server/mysql-test/r/max_statement_time_func.result'
--- Percona-Server/mysql-test/r/max_statement_time_func.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/max_statement_time_func.result	2013-09-09 15:30:42 +0000
@@ -0,0 +1,116 @@
+SET @old_session_max_statement_time = @@SESSION.max_statement_time;
+#
+# Test max statement time interruption.
+# Note that if SLEEP() is interrupted, it returns 1.
+#
+SET @@SESSION.max_statement_time = 10;
+SELECT SLEEP(1000);
+SLEEP(1000)
+1
+SET @@SESSION.max_statement_time = 0;
+#
+# Apply timeout to the top-level statement.
+#
+CREATE PROCEDURE p1()
+BEGIN
+SELECT SLEEP(1000);
+END|
+SET @@SESSION.max_statement_time = 10;
+CALL p1();
+SLEEP(1000)
+1
+SET @@SESSION.max_statement_time = 0;
+# Apply timeout to prepared statements.
+PREPARE prep_1 FROM 'call p1()';
+SET @@SESSION.max_statement_time = 10;
+EXECUTE prep_1;
+SLEEP(1000)
+1
+SET @@SESSION.max_statement_time = 0;
+DROP PREPARE prep_1;
+DROP PROCEDURE p1;
+#
+# Interrupt a statement that changes data.
+#
+CREATE TABLE t1 (a INT);
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+WHILE true DO
+INSERT INTO t1 VALUES (1);
+END WHILE;
+RETURN 1;
+END|
+SET @@SESSION.max_statement_time = 500;
+SELECT f1();
+ERROR 70101: Query execution was interrupted, max_statement_time exceeded
+SET @@SESSION.max_statement_time = 0;
+DROP FUNCTION f1;
+DROP TABLE t1;
+SELECT CONVERT(VARIABLE_VALUE, UNSIGNED) INTO @time_set
+FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_SET';
+SELECT CONVERT(VARIABLE_VALUE, UNSIGNED) INTO @time_exceeded
+FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_EXCEEDED';
+SET @@SESSION.max_statement_time = 100;
+SELECT SLEEP(1000);
+SLEEP(1000)
+1
+# Ensure that the counters for:
+# - statements that are time limited; and
+# - statements that exceeded their maximum execution time
+# are incremented.
+SELECT 1 AS STATUS FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_SET'
+        AND CONVERT(VARIABLE_VALUE, UNSIGNED) > @time_set;
+STATUS
+SELECT 1 AS STATUS FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_EXCEEDED'
+        AND CONVERT(VARIABLE_VALUE, UNSIGNED) > @time_exceeded;
+STATUS
+SET @@SESSION.max_statement_time = default;
+
+# Check that the appropriate error status is set.
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+START TRANSACTION;
+SELECT * FROM t1 FOR UPDATE;
+a
+1
+SET @@SESSION.max_statement_time = 100;
+UPDATE t1 SET a = 2;
+ERROR 70101: Query execution was interrupted, max_statement_time exceeded
+SHOW WARNINGS;
+Level	Code	Message
+Error	1877	Query execution was interrupted, max_statement_time exceeded
+ROLLBACK;
+DROP TABLE t1;
+#
+# Test interaction with lock waits.
+#
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET @@SESSION.max_statement_time = 500;
+LOCK TABLES t1 WRITE;
+LOCK TABLES t1 READ;
+ERROR 70101: Query execution was interrupted, max_statement_time exceeded
+UNLOCK TABLES;
+BEGIN;
+SELECT * FROM t1;
+a
+1
+ALTER TABLE t1 ADD COLUMN b INT;
+ERROR 70101: Query execution was interrupted, max_statement_time exceeded
+ROLLBACK;
+SELECT GET_LOCK('lock', 1);
+GET_LOCK('lock', 1)
+1
+SELECT GET_LOCK('lock', 1);
+GET_LOCK('lock', 1)
+NULL
+SELECT RELEASE_LOCK('lock');
+RELEASE_LOCK('lock')
+1
+DROP TABLE t1;
+SET @@SESSION.max_statement_time = @old_session_max_statement_time;

=== modified file 'Percona-Server/mysql-test/r/mysqld--help-notwin.result'
--- Percona-Server/mysql-test/r/mysqld--help-notwin.result	2013-09-09 07:01:33 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-notwin.result	2013-09-09 15:30:42 +0000
@@ -448,6 +448,9 @@
  value are used; the rest are ignored)
  --max-sp-recursion-depth[=#] 
  Maximum stored procedure recursion depth
+ --max-statement-time=# 
+ Kill any statement that takes over the specified number
+ of milliseconds
  --max-tmp-tables=#  Maximum number of temporary tables a client can keep open
  at a time
  --max-user-connections=# 
@@ -1209,6 +1212,7 @@
 max-seeks-for-key 18446744073709551615
 max-sort-length 1024
 max-sp-recursion-depth 0
+max-statement-time 0
 max-tmp-tables 32
 max-user-connections 0
 max-write-lock-count 18446744073709551615

=== modified file 'Percona-Server/mysql-test/r/mysqld--help-win.result'
--- Percona-Server/mysql-test/r/mysqld--help-win.result	2013-09-09 07:01:33 +0000
+++ Percona-Server/mysql-test/r/mysqld--help-win.result	2013-09-09 15:30:42 +0000
@@ -424,6 +424,9 @@
  value are used; the rest are ignored)
  --max-sp-recursion-depth[=#] 
  Maximum stored procedure recursion depth
+ --max-statement-time=# 
+ Kill any statement that takes over the specified number
+ of milliseconds
  --max-tmp-tables=#  Maximum number of temporary tables a client can keep open
  at a time
  --max-user-connections=# 
@@ -1155,6 +1158,7 @@
 max-seeks-for-key 18446744073709551615
 max-sort-length 1024
 max-sp-recursion-depth 0
+max-statement-time 0
 max-tmp-tables 32
 max-user-connections 0
 max-write-lock-count 18446744073709551615

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/have_statement_timeout_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/have_statement_timeout_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/have_statement_timeout_basic.result	2013-09-09 15:30:42 +0000
@@ -0,0 +1,53 @@
+# Displaying default value
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+COUNT(@@GLOBAL.have_statement_timeout)
+1
+1 Expected
+# Check if Value can set
+SET @@GLOBAL.have_statement_timeout=1;
+ERROR HY000: Variable 'have_statement_timeout' is a read only variable
+Expected error 'Read only variable'
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+COUNT(@@GLOBAL.have_statement_timeout)
+1
+1 Expected
+# Check if the value in GLOBAL Table matches value in variable
+SELECT @@GLOBAL.have_statement_timeout = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='have_statement_timeout';
+@@GLOBAL.have_statement_timeout = VARIABLE_VALUE
+1
+1 Expected
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+COUNT(@@GLOBAL.have_statement_timeout)
+1
+1 Expected
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='have_statement_timeout';
+COUNT(VARIABLE_VALUE)
+1
+1 Expected
+# Check if accessing variable with and without GLOBAL point to same variable
+SELECT @@have_statement_timeout = @@GLOBAL.have_statement_timeout;
+@@have_statement_timeout = @@GLOBAL.have_statement_timeout
+1
+1 Expected
+# Check if have_statement_timeout can be accessed with and without @@ sign
+SELECT COUNT(@@have_statement_timeout);
+COUNT(@@have_statement_timeout)
+1
+1 Expected
+SELECT COUNT(@@local.have_statement_timeout);
+ERROR HY000: Variable 'have_statement_timeout' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@SESSION.have_statement_timeout);
+ERROR HY000: Variable 'have_statement_timeout' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+COUNT(@@GLOBAL.have_statement_timeout)
+1
+1 Expected
+SELECT have_statement_timeout = @@SESSION.have_statement_timeout;
+ERROR 42S22: Unknown column 'have_statement_timeout' in 'field list'
+Expected error 'Unknown column 'have_statement_timeout' in 'field list''

=== added file 'Percona-Server/mysql-test/suite/sys_vars/r/max_statement_time_basic.result'
--- Percona-Server/mysql-test/suite/sys_vars/r/max_statement_time_basic.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/r/max_statement_time_basic.result	2013-09-09 15:30:42 +0000
@@ -0,0 +1,89 @@
+# Save initial value
+SET @start_session_value = @@session.max_statement_time;
+SELECT @start_session_value;
+@start_session_value
+0
+# Display the DEFAULT value of max_statement_time
+SET @@session.max_statement_time = 20000;
+SET @@session.max_statement_time = DEFAULT;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+0
+# Check the DEFAULT value of max_statement_time
+SET @@session.max_statement_time = DEFAULT;
+SELECT @@session.max_statement_time = 28800;
+@@session.max_statement_time = 28800
+0
+# Change the value of max_statement_time to a valid value for SESSION scope
+SET @@session.max_statement_time = 10000;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+10000
+SET @@session.max_statement_time = 50050;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+50050
+SET @@session.max_statement_time = 65535;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+65535
+# Change the value of max_statement_time to an invalid value #
+SET @@session.max_statement_time = 0;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+0
+SET @@session.max_statement_time = -2;
+Warnings:
+Warning	1292	Truncated incorrect max_statement_time value: '-2'
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+0
+SET @@session.max_statement_time = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'max_statement_time'
+SET @@session.max_statement_time = 100000000;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
[phone]
+SET @@session.max_statement_time = test;
+ERROR 42000: Incorrect argument type to variable 'max_statement_time'
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
[phone]
+# Check if the value in SESSION Table matches value in variable
+SELECT @@session.max_statement_time = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='max_statement_time';
+@@session.max_statement_time = VARIABLE_VALUE
+1
+# Check if TRUE and FALSE values can be used on variable
+SET @@session.max_statement_time = TRUE;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+1
+SET @@session.max_statement_time = FALSE;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+0
+# Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable
+SET @@max_statement_time = 10000;
+SELECT @@max_statement_time = @@local.max_statement_time;
+@@max_statement_time = @@local.max_statement_time
+1
+SELECT @@local.max_statement_time = @@session.max_statement_time;
+@@local.max_statement_time = @@session.max_statement_time
+1
+# Check if max_statement_time can be accessed with and without @@ sign
+SET max_statement_time = 10000;
+SELECT @@max_statement_time;
+@@max_statement_time
+10000
+SELECT local.max_statement_time;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.max_statement_time;
+ERROR 42S02: Unknown table 'session' in field list
+SET @@global.max_statement_time = 0;
+# Restore initial value
+SET @@session.max_statement_time = @start_session_value;
+SELECT @@session.max_statement_time;
+@@session.max_statement_time
+0

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/have_statement_timeout_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/have_statement_timeout_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/have_statement_timeout_basic.test	2013-09-09 15:30:42 +0000
@@ -0,0 +1,55 @@
+--source include/have_statement_timeout.inc
+
+--echo # Displaying default value
+
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+--echo 1 Expected
+
+--echo # Check if Value can set
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@GLOBAL.have_statement_timeout=1;
+--echo Expected error 'Read only variable'
+
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+--echo 1 Expected
+
+--echo # Check if the value in GLOBAL Table matches value in variable
+
+SELECT @@GLOBAL.have_statement_timeout = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='have_statement_timeout';
+--echo 1 Expected
+
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+--echo 1 Expected
+
+SELECT COUNT(VARIABLE_VALUE)
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='have_statement_timeout';
+--echo 1 Expected
+
+--echo # Check if accessing variable with and without GLOBAL point to same variable
+
+SELECT @@have_statement_timeout = @@GLOBAL.have_statement_timeout;
+--echo 1 Expected
+
+--echo # Check if have_statement_timeout can be accessed with and without @@ sign
+
+SELECT COUNT(@@have_statement_timeout);
+--echo 1 Expected
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@local.have_statement_timeout);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.have_statement_timeout);
+--echo Expected error 'Variable is a GLOBAL variable'
+
+SELECT COUNT(@@GLOBAL.have_statement_timeout);
+--echo 1 Expected
+
+--error ER_BAD_FIELD_ERROR
+SELECT have_statement_timeout = @@SESSION.have_statement_timeout;
+--echo Expected error 'Unknown column 'have_statement_timeout' in 'field list''

=== added file 'Percona-Server/mysql-test/suite/sys_vars/t/max_statement_time_basic.test'
--- Percona-Server/mysql-test/suite/sys_vars/t/max_statement_time_basic.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/sys_vars/t/max_statement_time_basic.test	2013-09-09 15:30:42 +0000
@@ -0,0 +1,78 @@
+--source include/have_statement_timeout.inc
+
+--echo # Save initial value
+
+SET @start_session_value = @@session.max_statement_time;
+SELECT @start_session_value;
+
+--echo # Display the DEFAULT value of max_statement_time
+
+SET @@session.max_statement_time = 20000;
+SET @@session.max_statement_time = DEFAULT;
+SELECT @@session.max_statement_time;
+
+--echo # Check the DEFAULT value of max_statement_time
+
+SET @@session.max_statement_time = DEFAULT;
+SELECT @@session.max_statement_time = 28800;
+
+--echo # Change the value of max_statement_time to a valid value for SESSION scope
+
+SET @@session.max_statement_time = 10000;
+SELECT @@session.max_statement_time;
+SET @@session.max_statement_time = 50050;
+SELECT @@session.max_statement_time;
+SET @@session.max_statement_time = 65535;
+SELECT @@session.max_statement_time;
+
+--echo # Change the value of max_statement_time to an invalid value #
+
+SET @@session.max_statement_time = 0;
+SELECT @@session.max_statement_time;
+SET @@session.max_statement_time = -2;
+SELECT @@session.max_statement_time;
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@session.max_statement_time = 65530.34;
+SET @@session.max_statement_time = 100000000;
+SELECT @@session.max_statement_time;
+
+--error ER_WRONG_TYPE_FOR_VAR
+SET @@session.max_statement_time = test;
+SELECT @@session.max_statement_time;
+
+--echo # Check if the value in SESSION Table matches value in variable
+
+SELECT @@session.max_statement_time = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='max_statement_time';
+
+--echo # Check if TRUE and FALSE values can be used on variable
+
+SET @@session.max_statement_time = TRUE;
+SELECT @@session.max_statement_time;
+SET @@session.max_statement_time = FALSE;
+SELECT @@session.max_statement_time;
+
+--echo # Check if accessing variable with SESSION,LOCAL and without SCOPE points to same session variable
+
+SET @@max_statement_time = 10000;
+SELECT @@max_statement_time = @@local.max_statement_time;
+SELECT @@local.max_statement_time = @@session.max_statement_time;
+
+--echo # Check if max_statement_time can be accessed with and without @@ sign
+
+SET max_statement_time = 10000;
+SELECT @@max_statement_time;
+--error ER_UNKNOWN_TABLE
+SELECT local.max_statement_time;
+--error ER_UNKNOWN_TABLE
+SELECT session.max_statement_time;
+
+#--echo # Check that the variable is a SESSION-only variable
+#--error ER_LOCAL_VARIABLE
+SET @@global.max_statement_time = 0;
+
+--echo # Restore initial value
+
+SET @@session.max_statement_time = @start_session_value;
+SELECT @@session.max_statement_time;

=== added file 'Percona-Server/mysql-test/t/max_statement_time_func.test'
--- Percona-Server/mysql-test/t/max_statement_time_func.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/max_statement_time_func.test	2013-09-09 15:30:42 +0000
@@ -0,0 +1,154 @@
+--source include/have_statement_timeout.inc
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+
+SET @old_session_max_statement_time = @@SESSION.max_statement_time;
+
+--echo #
+--echo # Test max statement time interruption.
+--echo # Note that if SLEEP() is interrupted, it returns 1.
+--echo #
+
+SET @@SESSION.max_statement_time = 10;
+SELECT SLEEP(1000);
+SET @@SESSION.max_statement_time = 0;
+
+--echo #
+--echo # Apply timeout to the top-level statement.
+--echo #
+
+DELIMITER |;
+
+CREATE PROCEDURE p1()
+BEGIN
+  SELECT SLEEP(1000);
+END|
+
+DELIMITER ;|
+
+SET @@SESSION.max_statement_time = 10;
+CALL p1();
+SET @@SESSION.max_statement_time = 0;
+
+--echo # Apply timeout to prepared statements.
+PREPARE prep_1 FROM 'call p1()';
+SET @@SESSION.max_statement_time = 10;
+EXECUTE prep_1;
+SET @@SESSION.max_statement_time = 0;
+
+DROP PREPARE prep_1;
+DROP PROCEDURE p1;
+
+--echo #
+--echo # Interrupt a statement that changes data.
+--echo #
+
+CREATE TABLE t1 (a INT);
+
+DELIMITER |;
+
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+  WHILE true DO
+    INSERT INTO t1 VALUES (1);
+  END WHILE;
+  RETURN 1;
+END|
+
+DELIMITER ;|
+
+SET @@SESSION.max_statement_time = 500;
+--error ER_QUERY_TIMEOUT
+SELECT f1();
+SET @@SESSION.max_statement_time = 0;
+
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+SELECT CONVERT(VARIABLE_VALUE, UNSIGNED) INTO @time_set
+  FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_SET';
+
+SELECT CONVERT(VARIABLE_VALUE, UNSIGNED) INTO @time_exceeded
+  FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_EXCEEDED';
+
+SET @@SESSION.max_statement_time = 100;
+SELECT SLEEP(1000);
+
+--echo # Ensure that the counters for:
+--echo # - statements that are time limited; and
+--echo # - statements that exceeded their maximum execution time
+--echo # are incremented.
+
+SELECT 1 AS STATUS FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_SET'
+        AND CONVERT(VARIABLE_VALUE, UNSIGNED) > @time_set;
+
+SELECT 1 AS STATUS FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+  WHERE VARIABLE_NAME = 'MAX_STATEMENT_TIME_EXCEEDED'
+        AND CONVERT(VARIABLE_VALUE, UNSIGNED) > @time_exceeded;
+
+SET @@SESSION.max_statement_time = default;
+
+--echo
+--echo # Check that the appropriate error status is set.
+--echo
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+
+START TRANSACTION;
+SELECT * FROM t1 FOR UPDATE;
+
+connect (con1,localhost,root,,test,,);
+SET @@SESSION.max_statement_time = 100;
+--error ER_QUERY_TIMEOUT
+UPDATE t1 SET a = 2;
+SHOW WARNINGS;
+disconnect con1;
+
+connection default;
+ROLLBACK;
+
+DROP TABLE t1;
+
+
+--echo #
+--echo # Test interaction with lock waits.
+--echo #
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+
+connect (con1,localhost,root,,test,,);
+SET @@SESSION.max_statement_time = 500;
+
+connection default;
+LOCK TABLES t1 WRITE;
+
+connection con1;
+--error ER_QUERY_TIMEOUT
+LOCK TABLES t1 READ;
+
+connection default;
+UNLOCK TABLES;
+BEGIN;
+SELECT * FROM t1;
+
+connection con1;
+--error ER_QUERY_TIMEOUT
+ALTER TABLE t1 ADD COLUMN b INT;
+
+connection default;
+ROLLBACK;
+SELECT GET_LOCK('lock', 1);
+
+connection con1;
+SELECT GET_LOCK('lock', 1);
+
+disconnect con1;
+connection default;
+SELECT RELEASE_LOCK('lock');
+DROP TABLE t1;
+SET @@SESSION.max_statement_time = @old_session_max_statement_time;

=== modified file 'Percona-Server/mysys/CMakeLists.txt'
--- Percona-Server/mysys/CMakeLists.txt	2013-08-06 15:16:34 +0000
+++ Percona-Server/mysys/CMakeLists.txt	2013-09-09 15:30:42 +0000
@@ -45,6 +45,14 @@
  SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_alarm.c)
 ENDIF()
 
+IF(HAVE_POSIX_TIMERS)
+ SET(MYSYS_SOURCES ${MYSYS_SOURCES} posix_timers.c)
+ENDIF()
+
+IF(HAVE_KQUEUE_TIMERS)
+  SET(MYSYS_SOURCES ${MYSYS_SOURCES} kqueue_timers.c)
+ENDIF()
+
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
   # Inline assembly template for rdtsc
   SET_SOURCE_FILES_PROPERTIES(my_rdtsc.c

=== added file 'Percona-Server/mysys/kqueue_timers.c'
--- Percona-Server/mysys/kqueue_timers.c	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysys/kqueue_timers.c	2013-09-09 15:30:42 +0000
@@ -0,0 +1,219 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "my_timer.h"     /* my_timer_t */
+#include "my_pthread.h"   /* my_thread_init, my_thread_end */
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <errno.h>
+
+static int kq_fd= -1;
+static pthread_t thread;
+
+/**
+  Timer expiration notification thread.
+
+  @param  arg   Unused.
+*/
+
+static void *
+timer_notify_thread(void *arg __attribute__((unused)))
+{
+  my_timer_t *timer;
+  struct kevent kev;
+
+  my_thread_init();
+
+  while (1)
+  {
+    if (kevent(kq_fd, NULL, 0, &kev, 1, NULL) < 0)
+      continue;
+
+    if (kev.filter == EVFILT_TIMER)
+    {
+      timer= kev.udata;
+      assert(timer->id == kev.ident);
+      timer->notify_function(timer);
+    }
+    else if (kev.filter == EVFILT_USER)
+      break;
+  }
+
+  my_thread_end();
+
+  return NULL;
+}
+
+
+/**
+  Create a helper thread to dispatch timer expiration notifications.
+
+  @return On success, 0. On error, -1 is returned.
+*/
+
+static int
+start_helper_thread(void)
+{
+  struct kevent kev;
+
+  EV_SET(&kev, 0, EVFILT_USER, EV_ADD, 0, 0, 0);
+
+  if (kevent(kq_fd, &kev, 1, NULL, 0, NULL) < 0)
+    return -1;
+
+  return pthread_create(&thread, NULL, timer_notify_thread, NULL);
+}
+
+
+/**
+  Initialize internal components.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_init_ext(void)
+{
+  int rc;
+
+  /* Create a file descriptor for event notification. */
+  if ((kq_fd= kqueue()) < 0)
+    return -1;
+
+  /* Create a helper thread. */
+  if ((rc= start_helper_thread()))
+    close(kq_fd);
+
+  return rc;
+}
+
+
+/**
+  Release any resources that were allocated as part of initialization.
+*/
+
+void
+my_os_timer_deinit(void)
+{
+  struct kevent kev;
+
+  EV_SET(&kev, 0, EVFILT_USER, 0, NOTE_TRIGGER, 0, 0);
+
+  /* There's not much to do if triggering the event fails. */
+  if (kevent(kq_fd, &kev, 1, NULL, 0, NULL) > -1)
+    pthread_join(thread, NULL);
+
+  close(kq_fd);
+}
+
+
+/**
+  Create a timer object.
+
+  @param  timer   Timer object.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_create(my_timer_t *timer)
+{
+  assert(kq_fd >= 0);
+
+  timer->id= (uintptr_t) timer;
+
+  return 0;
+}
+
+
+/**
+  Set the time until the next expiration of the timer.
+
+  @param  timer   Timer object.
+  @param  time    Amount of time (in milliseconds) before the timer expires.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_set(my_timer_t *timer, unsigned long time)
+{
+  struct kevent kev;
+
+  EV_SET(&kev, timer->id, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, time, timer);
+
+  return kevent(kq_fd, &kev, 1, NULL, 0, NULL);
+}
+
+
+/**
+  Reset the time until the next expiration of the timer.
+
+  @param  timer   Timer object.
+  @param  state   The state of the timer at the time of cancellation, either
+                  signaled (false) or nonsignaled (true).
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_reset(my_timer_t *timer, int *state)
+{
+  int status;
+  struct kevent kev;
+
+  EV_SET(&kev, timer->id, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
+
+  status= kevent(kq_fd, &kev, 1, NULL, 0, NULL);
+
+  /*
+    If the event was retrieved from the kqueue (at which point we
+    consider it to be signaled), the timer was automatically deleted.
+  */
+  if (!status)
+    *state= 1;
+  else if (errno == ENOENT)
+  {
+    *state= 0;
+    status= 0;
+  }
+
+  return status;
+}
+
+
+/**
+  Delete a timer object.
+
+  @param  timer   Timer object.
+*/
+
+void
+my_os_timer_delete(my_timer_t *timer)
+{
+  struct kevent kev;
+
+  EV_SET(&kev, timer->id, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
+
+  kevent(kq_fd, &kev, 1, NULL, 0, NULL);
+}
+

=== added file 'Percona-Server/mysys/posix_timers.c'
--- Percona-Server/mysys/posix_timers.c	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysys/posix_timers.c	2013-09-09 15:30:42 +0000
@@ -0,0 +1,256 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "my_timer.h"       /* my_timer_t */
+#include "my_pthread.h"     /* my_thread_init, my_thread_end */
+#include "m_string.h"         /* memset */
+#include <sys/syscall.h>    /* SYS_gettid */
+
+#ifndef sigev_notify_thread_id
+#define sigev_notify_thread_id   _sigev_un._tid
+#endif
+
+#define MY_TIMER_EVENT_SIGNO  (SIGRTMIN)
+#define MY_TIMER_KILL_SIGNO   (SIGRTMIN+1)
+
+/* Timer thread object. */
+static pthread_t thread;
+
+/* Timer thread ID (TID). */
+static pid_t thread_id;
+
+/**
+  Timer expiration notification function.
+
+  @param  sigev_value   Signal (notification) value.
+
+  @remark The notification function is usually run in a helper thread
+          and is called each time the timer expires.
+*/
+
+static void
+timer_notify_function(sigval_t sigev_value)
+{
+  my_timer_t *timer= sigev_value.sival_ptr;
+  timer->notify_function(timer);
+}
+
+
+/**
+  Timer expiration notification thread.
+
+  @param  arg   Barrier object.
+*/
+
+static void *
+timer_notify_thread(void *arg)
+{
+  sigset_t set;
+  siginfo_t info;
+  pthread_barrier_t *barrier= arg;
+
+  my_thread_init();
+
+  sigemptyset(&set);
+  sigaddset(&set, MY_TIMER_EVENT_SIGNO);
+  sigaddset(&set, MY_TIMER_KILL_SIGNO);
+
+  /* Get the thread ID of the current thread. */
+  thread_id= (pid_t) syscall(SYS_gettid);
+
+  /* Wake up parent thread, thread_id is available. */
+  pthread_barrier_wait(barrier);
+
+  while (1)
+  {
+    if (sigwaitinfo(&set, &info) < 0)
+      continue;
+
+    if (info.si_signo == MY_TIMER_EVENT_SIGNO)
+      timer_notify_function(info.si_value);
+    else if (info.si_signo == MY_TIMER_KILL_SIGNO)
+      break;
+  }
+
+  my_thread_end();
+
+  return NULL;
+}
+
+
+/**
+  Create a helper thread to dispatch timer expiration notifications.
+
+  @return On success, 0. On error, -1 is returned.
+*/
+
+static int
+start_helper_thread(void)
+{
+  pthread_barrier_t barrier;
+
+  if (pthread_barrier_init(&barrier, NULL, 2))
+    return -1;
+
+  if (pthread_create(&thread, NULL, timer_notify_thread, &barrier))
+    return -1;
+
+  pthread_barrier_wait(&barrier);
+  pthread_barrier_destroy(&barrier);
+
+  return 0;
+}
+
+
+/**
+  Initialize internal components.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_init_ext(void)
+{
+  int rc;
+  sigset_t set, old_set;
+
+  if (sigfillset(&set))
+    return -1;
+
+  /*
+    Temporarily block all signals. New thread will inherit signal
+    mask of the current thread.
+  */
+  if (pthread_sigmask(SIG_BLOCK, &set, &old_set))
+    return -1;
+
+  /* Create a helper thread. */
+  rc= start_helper_thread();
+
+  /* Restore the signal mask. */
+  pthread_sigmask(SIG_SETMASK, &old_set, NULL);
+
+  return rc;
+}
+
+
+/**
+  Release any resources that were allocated as part of initialization.
+*/
+
+void
+my_os_timer_deinit(void)
+{
+  /* Kill helper thread. */
+  pthread_kill(thread, MY_TIMER_KILL_SIGNO);
+
+  /* Wait for helper thread termination. */
+  pthread_join(thread, NULL);
+}
+
+
+/**
+  Create a timer object.
+
+  @param  timer   Location where the timer ID is returned.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_create(my_timer_t *timer)
+{
+  struct sigevent sigev;
+
+  memset(&sigev, 0, sizeof(sigev));
+
+  sigev.sigev_value.sival_ptr= timer;
+  sigev.sigev_signo= MY_TIMER_EVENT_SIGNO;
+  sigev.sigev_notify= SIGEV_SIGNAL | SIGEV_THREAD_ID;
+  sigev.sigev_notify_thread_id= thread_id;
+
+  return timer_create(CLOCK_MONOTONIC, &sigev, &timer->id);
+}
+
+
+/**
+  Set the time until the next expiration of the timer.
+
+  @param  timer   Timer object.
+  @param  time    Amount of time (in milliseconds) before the timer expires.
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_set(my_timer_t *timer, unsigned long time)
+{
+  const struct itimerspec spec= {
+    .it_interval= {.tv_sec= 0, .tv_nsec= 0},
+    .it_value= {.tv_sec= time / 1000,
+                .tv_nsec= (time % 1000) * 1000000}
+  };
+
+  return timer_settime(timer->id, 0, &spec, NULL);
+}
+
+
+/**
+  Reset the time until the next expiration of the timer.
+
+  @param  timer   Timer object.
+  @param  state   The state of the timer at the time of cancellation, either
+                  signaled (false) or nonsignaled (true).
+
+  @return On success, 0.
+          On error, -1 is returned, and errno is set to indicate the error.
+*/
+
+int
+my_os_timer_reset(my_timer_t *timer, int *state)
+{
+  int status;
+  struct itimerspec old_spec;
+
+  /* A zeroed initial expiration value disarms the timer. */
+  const struct timespec zero_time= { .tv_sec= 0, .tv_nsec= 0 };
+  const struct itimerspec zero_spec= { .it_value= zero_time };
+
+  /*
+    timer_settime returns the amount of time before the timer
+    would have expired or zero if the timer was disarmed.
+  */
+  if (! (status= timer_settime(timer->id, 0, &zero_spec, &old_spec)))
+    *state= (old_spec.it_value.tv_sec || old_spec.it_value.tv_nsec);
+
+  return status;
+}
+
+
+/**
+  Delete a timer object.
+
+  @param  timer   Timer object.
+*/
+
+void
+my_os_timer_delete(my_timer_t *timer)
+{
+  timer_delete(timer->id);
+}
+

=== modified file 'Percona-Server/sql/CMakeLists.txt'
--- Percona-Server/sql/CMakeLists.txt	2013-06-25 13:13:06 +0000
+++ Percona-Server/sql/CMakeLists.txt	2013-09-09 15:30:42 +0000
@@ -206,6 +206,10 @@
   )
 ENDIF()
 
+IF(HAVE_MY_TIMER)
+  SET(SQL_SOURCE ${SQL_SOURCE} sql_timer.cc)
+ENDIF()
+
 MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
 RECOMPILE_FOR_EMBEDDED)
 

=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2013-08-22 13:38:28 +0000
+++ Percona-Server/sql/handler.cc	2013-09-09 15:30:42 +0000
@@ -887,6 +887,24 @@
   plugin_foreach(thd, closecon_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN, 0);
 }
 
+static my_bool kill_handlerton(THD *thd, plugin_ref plugin, void *)
+{
+  handlerton *hton= plugin_data(plugin, handlerton *);
+
+  if (hton->state == SHOW_OPTION_YES && hton->kill_connection)
+  {
+    if (thd_get_ha_data(thd, hton))
+      hton->kill_connection(hton, thd);
+  }
+
+  return FALSE;
+}
+
+void ha_kill_connection(THD *thd)
+{
+  plugin_foreach(thd, kill_handlerton, MYSQL_STORAGE_ENGINE_PLUGIN, 0);
+}
+
 /* ========================================================================
  ======================= TRANSACTIONS ===================================*/
 

=== modified file 'Percona-Server/sql/handler.h'
--- Percona-Server/sql/handler.h	2013-08-22 13:38:28 +0000
+++ Percona-Server/sql/handler.h	2013-09-09 15:30:42 +0000
@@ -908,6 +908,9 @@
                             const char *db, const char *table_name);
    int (*release_temporary_latches)(handlerton *hton, THD *thd);
 
+   /* Terminate connection/statement notification. */
+   void (*kill_connection)(handlerton *hton, THD *thd);
+
    /*
      Get log status.
      If log_status is null then the handler do not support transaction
@@ -3399,6 +3402,7 @@
 TYPELIB* ha_known_exts();
 int ha_panic(enum ha_panic_function flag);
 void ha_close_connection(THD* thd);
+void ha_kill_connection(THD *thd);
 bool ha_flush_logs(handlerton *db_type);
 void ha_drop_database(char* path);
 int ha_create_table(THD *thd, const char *path,

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-09-09 07:01:33 +0000
+++ Percona-Server/sql/mysqld.cc	2013-09-09 15:30:42 +0000
@@ -108,6 +108,8 @@
 #include "sp_cache.h"
 #include "sql_reload.h"  // reload_acl_and_cache
 
+#include "my_timer.h"    // my_os_timer_init_ext, my_os_timer_deinit
+
 #ifdef HAVE_POLL_H
 #include <poll.h>
 #endif
@@ -720,6 +722,8 @@
 extern TYPELIB utility_user_privileges_typelib;
 ulonglong utility_user_privileges= 0;
 
+SHOW_COMP_OPTION have_statement_timeout= SHOW_OPTION_DISABLED;
+
 /* Thread specific variables */
 
 pthread_key(MEM_ROOT**,THR_MALLOC);
@@ -1789,6 +1793,12 @@
 
   memcached_shutdown();
 
+#ifdef HAVE_MY_TIMER
+  if (have_statement_timeout == SHOW_OPTION_YES)
+    my_os_timer_deinit();
+#endif
+
+  have_statement_timeout= SHOW_OPTION_DISABLED;
   /*
     make sure that handlers finish up
     what they have that is dependent on the binlog
@@ -4584,6 +4594,15 @@
   if (table_def_init() | hostname_cache_init())
     unireg_abort(1);
 
+#ifdef HAVE_MY_TIMER
+  if (my_os_timer_init_ext())
+    sql_print_error("Failed to initialize timer component (errno %d).", errno);
+  else
+    have_statement_timeout= SHOW_OPTION_YES;
+#else
+  have_statement_timeout= SHOW_OPTION_NO;
+#endif
+
   query_cache_set_min_res_unit(query_cache_min_res_unit);
   query_cache_init();
   query_cache_resize(query_cache_size);
@@ -7991,6 +8010,9 @@
   {"Last_query_cost",          (char*) offsetof(STATUS_VAR, last_query_cost), SHOW_DOUBLE_STATUS},
   {"Last_query_partial_plans", (char*) offsetof(STATUS_VAR, last_query_partial_plans), SHOW_LONGLONG_STATUS},
   {"Max_used_connections",     (char*) &max_used_connections,  SHOW_LONG},
+  {"Max_statement_time_exceeded",   (char*) offsetof(STATUS_VAR, max_statement_time_exceeded), SHOW_LONG_STATUS},
+  {"Max_statement_time_set",        (char*) offsetof(STATUS_VAR, max_statement_time_set), SHOW_LONG_STATUS},
+  {"Max_statement_time_set_failed", (char*) offsetof(STATUS_VAR, max_statement_time_set_failed), SHOW_LONG_STATUS},
   {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use,    SHOW_LONG_NOFLUSH},
   {"Open_files",               (char*) &my_file_opened,         SHOW_LONG_NOFLUSH},
   {"Open_streams",             (char*) &my_stream_opened,       SHOW_LONG_NOFLUSH},

=== modified file 'Percona-Server/sql/set_var.h'
--- Percona-Server/sql/set_var.h	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/set_var.h	2013-09-09 15:30:42 +0000
@@ -340,6 +340,7 @@
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;
 extern SHOW_COMP_OPTION have_compress;
+extern SHOW_COMP_OPTION have_statement_timeout;
 
 /*
   Prototypes for helper functions

=== modified file 'Percona-Server/sql/share/errmsg-utf8.txt'
--- Percona-Server/sql/share/errmsg-utf8.txt	2013-08-06 15:16:34 +0000
+++ Percona-Server/sql/share/errmsg-utf8.txt	2013-09-09 15:30:42 +0000
@@ -7082,6 +7082,9 @@
 ER_STOP_SLAVE_IO_THREAD_TIMEOUT
   eng "STOP SLAVE command execution is incomplete: Slave IO thread got the stop signal, thread is busy, IO thread will stop once the current task is complete."
 
+ER_QUERY_TIMEOUT 70101
+        eng "Query execution was interrupted, max_statement_time exceeded"
+
 #
 #  End of 5.6 error messages.
 #

=== modified file 'Percona-Server/sql/signal_handler.cc'
--- Percona-Server/sql/signal_handler.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/signal_handler.cc	2013-09-09 15:30:42 +0000
@@ -181,6 +181,9 @@
     case THD::KILL_QUERY:
       kreason= "KILL_QUERY";
       break;
+    case THD::KILL_TIMEOUT:
+      kreason= "KILL_TIMEOUT";
+      break;
     case THD::KILLED_NO_VALUE:
       kreason= "KILLED_NO_VALUE";
       break;

=== modified file 'Percona-Server/sql/sql_class.cc'
--- Percona-Server/sql/sql_class.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/sql_class.cc	2013-09-09 15:30:42 +0000
@@ -66,6 +66,8 @@
 using std::min;
 using std::max;
 
+#include "sql_timer.h"                          // thd_timer_end
+
 /*
   The following is used to initialise Table_ident with a internal
   table name
@@ -764,8 +766,11 @@
   
   @note LOCK_thread_count mutex is not necessary when the function is invoked on
    the currently running thread (current_thd) or if the caller in some other
-   way guarantees that access to thd->query is serialized.
- 
+   way guarantees that the thread won't be going away.
+
+  @note The query string is only printed if the session (thd) to be
+        described belongs to the calling thread.
+
   @return Pointer to string
 */
 
@@ -778,13 +783,11 @@
   char header[256];
   int len;
   /*
-    The pointers thd->query and thd->proc_info might change since they are
-    being modified concurrently. This is acceptable for proc_info since its
-    values doesn't have to very accurate and the memory it points to is static,
-    but we need to attempt a snapshot on the pointer values to avoid using NULL
-    values. The pointer to thd->query however, doesn't point to static memory
-    and has to be protected by LOCK_thread_count or risk pointing to
-    uninitialized memory.
+    The thd->proc_info pointer might change since it is being modified
+    concurrently. This is acceptable for proc_info since its value
+    doesn't have to be accurate and the memory it points to is static,
+    but we need to attempt a snapshot on the pointer values to avoid
+    using NULL values.
   */
   const char *proc_info= thd->proc_info;
 
@@ -818,9 +821,7 @@
     str.append(proc_info);
   }
 
-  mysql_mutex_lock(&thd->LOCK_thd_data);
-
-  if (thd->query())
+  if (thd == current_thd && thd->query())
   {
     if (max_query_len < 1)
       len= thd->query_length();
@@ -830,8 +831,6 @@
     str.append(thd->query(), len);
   }
 
-  mysql_mutex_unlock(&thd->LOCK_thd_data);
-
   if (str.c_ptr_safe() == buffer)
     return buffer;
 
@@ -1129,6 +1128,8 @@
 #ifndef DBUG_OFF
   gis_debug= 0;
 #endif
+
+  timer= timer_cache= NULL;
 }
 
 
@@ -1766,6 +1767,11 @@
   mysql_mutex_lock(&LOCK_thd_data);
   mysql_mutex_unlock(&LOCK_thd_data);
 
+  DBUG_ASSERT(timer == NULL);
+
+  if (timer_cache)
+    thd_timer_end(timer_cache);
+
   DBUG_PRINT("info", ("freeing security context"));
   main_security_ctx.destroy();
   my_free(db);
@@ -1890,7 +1896,8 @@
   /* Set the 'killed' flag of 'this', which is the target THD object. */
   killed= state_to_set;
 
-  if (state_to_set != THD::KILL_QUERY)
+  if (state_to_set != THD::KILL_QUERY &&
+      state_to_set != THD::KILL_TIMEOUT)
   {
 #ifdef SIGNAL_WITH_VIO_SHUTDOWN
     if (this != current_thd)
@@ -1933,6 +1940,13 @@
       MYSQL_CALLBACK(scheduler, post_kill_notification, (this));
   }
 
+  /* Interrupt target waiting inside a storage engine. */
+  if (state_to_set != THD::NOT_KILLED)
+    ha_kill_connection(this);
+
+  if (state_to_set == THD::KILL_TIMEOUT)
+    status_var_increment(status_var.max_statement_time_exceeded);
+
   /* Broadcast a condition to kick the target if it is waiting on it. */
   if (mysys_var)
   {
@@ -4251,6 +4265,16 @@
 }
 
 /**
+  Set the killed status of the current statement.
+
+  @param thd  user thread connection handle
+*/
+extern "C" void thd_set_kill_status(const MYSQL_THD thd)
+{
+  thd->send_kill_message();
+}
+
+/**
   Return the thread id of a user thread
   @param thd user thread
   @return thread id

=== modified file 'Percona-Server/sql/sql_class.h'
--- Percona-Server/sql/sql_class.h	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/sql_class.h	2013-09-09 15:30:42 +0000
@@ -86,6 +86,8 @@
 class User_level_lock;
 class user_var_entry;
 
+struct st_thd_timer;
+
 enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY, RNEXT_SAME };
 
 enum enum_delay_key_write { DELAY_KEY_WRITE_NONE, DELAY_KEY_WRITE_ON,
@@ -600,6 +602,8 @@
 
   my_bool pseudo_slave_mode;
 
+  ulong max_statement_time;
+
   Gtid_specification gtid_next;
   Gtid_set_or_null gtid_next_list;
 
@@ -682,6 +686,11 @@
   */
   double last_query_cost;
   ulonglong last_query_partial_plans;
+
+  ulong max_statement_time_exceeded;
+  ulong max_statement_time_set;
+  ulong max_statement_time_set_failed;
+
 } STATUS_VAR;
 
 /*
@@ -2387,6 +2396,9 @@
     return m_binlog_filter_state;
   }
 
+  /** Timer object. */
+  struct st_thd_timer *timer, *timer_cache;
+
 private:
   /**
     Indicate if the current statement should be discarded
@@ -3029,6 +3041,7 @@
     KILL_BAD_DATA=1,
     KILL_CONNECTION=ER_SERVER_SHUTDOWN,
     KILL_QUERY=ER_QUERY_INTERRUPTED,
+    KILL_TIMEOUT=ER_QUERY_TIMEOUT,
     KILLED_NO_VALUE      /* means neither of the states */
   };
   killed_state volatile killed;

=== modified file 'Percona-Server/sql/sql_parse.cc'
--- Percona-Server/sql/sql_parse.cc	2013-09-09 07:01:33 +0000
+++ Percona-Server/sql/sql_parse.cc	2013-09-09 15:30:42 +0000
@@ -105,6 +105,8 @@
 using std::max;
 using std::min;
 
+#include "sql_timer.h"        // thd_timer_set, thd_timer_reset
+
 #define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
 
 /**
@@ -1123,6 +1125,85 @@
   DBUG_RETURN(FALSE);
 }
 
+
+/**
+  Get the maximum execution time for a statement.
+
+  @return Length of time in milliseconds.
+
+  @remark A zero timeout means that no timeout should be
+          applied to this particular statement.
+*/
+
+static ulong inline get_max_statement_time(THD *thd)
+{
+
+  /* Assume query execution timeout feature is not used in the most cases */
+  if (likely(!thd->variables.max_statement_time))
+    return 0;
+
+  /* Check if timer support is implemented and was initialized. */
+  if (unlikely(have_statement_timeout != SHOW_OPTION_YES))
+    return 0;
+
+  /* The maximum execution time only applies to top-level statements. */
+  if (unlikely(thd->sp_runtime_ctx || thd->in_sub_stmt))
+    return 0;
+
+  /* Also does not apply to statements made by the slave thread. */
+  if (unlikely(thd->slave_thread))
+    return 0;
+
+  return thd->variables.max_statement_time;
+}
+
+
+/**
+  Set the time until the currently running statement is aborted.
+
+  @param  thd   Thread (session) context.
+
+  @return TRUE if the timer was armed.
+*/
+
+static inline bool set_statement_timer(THD *thd)
+{
+  ulong max_statement_time= get_max_statement_time(thd);
+
+  /* Assume query execution timeout feature is not used in the most cases */
+  if (likely(max_statement_time == 0))
+    return false;
+
+  if (unlikely(thd->timer != NULL))
+    return false;
+
+  thd->timer= thd_timer_set(thd, thd->timer_cache, max_statement_time);
+  thd->timer_cache= NULL;
+
+  if (thd->timer)
+    status_var_increment(thd->status_var.max_statement_time_set);
+  else
+    status_var_increment(thd->status_var.max_statement_time_set_failed);
+
+  return thd->timer;
+}
+
+
+/**
+  Deactivate the timer associated with the statement that was executed.
+
+  @param  thd   Thread (session) context.
+*/
+
+static void reset_statement_timer(THD *thd)
+{
+  DBUG_ASSERT(thd->timer);
+  /* Cache the timer object if it can be reused. */
+  thd->timer_cache= thd_timer_reset(thd->timer);
+  thd->timer= NULL;
+}
+
+
 /**
   Perform one connection-level (COM_XXXX) command.
 
@@ -2613,6 +2694,8 @@
   } /* endif unlikely slave */
 #endif
 
+  bool reset_timer= set_statement_timer(thd);
+
   status_var_increment(thd->status_var.com_stat[lex->sql_command]);
 
   Opt_trace_start ots(thd, all_tables, lex->sql_command, &lex->var_list,
@@ -5201,12 +5284,17 @@
   DBUG_ASSERT(!thd->in_active_multi_stmt_transaction() ||
                thd->in_multi_stmt_transaction_mode());
 
+  if (reset_timer)
+    reset_statement_timer(thd);
+
   if (! thd->in_sub_stmt)
   {
     /* report error issued during command execution */
     if (thd->killed_errno())
       thd->send_kill_message();
-    if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
+    if (thd->killed == THD::KILL_QUERY ||
+        thd->killed == THD::KILL_TIMEOUT ||
+        thd->killed == THD::KILL_BAD_DATA)
     {
       thd->killed= THD::NOT_KILLED;
       thd->mysys_var->abort= 0;

=== added file 'Percona-Server/sql/sql_timer.cc'
--- Percona-Server/sql/sql_timer.cc	1970-01-01 00:00:00 +0000
+++ Percona-Server/sql/sql_timer.cc	2013-09-09 15:30:42 +0000
@@ -0,0 +1,253 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "sql_class.h"      /* THD */
+#include "sql_timer.h"      /* thd_timer_set, etc. */
+#include "my_timer.h"       /* my_timer_t */
+
+struct st_thd_timer
+{
+  THD *thd;
+  my_timer_t timer;
+  pthread_mutex_t mutex;
+  bool destroy;
+};
+
+C_MODE_START
+static void timer_callback(my_timer_t *);
+C_MODE_END
+
+/**
+  Allocate and initialize a thread timer object.
+
+  @return NULL on failure.
+*/
+
+static thd_timer_t *
+thd_timer_create(void)
+{
+  thd_timer_t *ttp;
+  DBUG_ENTER("thd_timer_create");
+
+  ttp= (thd_timer_t *) my_malloc(sizeof(*ttp), MYF(MY_WME | MY_ZEROFILL));
+
+  if (ttp == NULL)
+    DBUG_RETURN(NULL);
+
+  ttp->timer.notify_function= timer_callback;
+  pthread_mutex_init(&ttp->mutex, MY_MUTEX_INIT_FAST);
+
+  if (! my_os_timer_create(&ttp->timer))
+    DBUG_RETURN(ttp);
+
+  pthread_mutex_destroy(&ttp->mutex);
+  my_free(ttp);
+
+  DBUG_RETURN(NULL);
+}
+
+
+/**
+  Release resources allocated for a thread timer.
+
+  @param  ttp   Thread timer object.
+*/
+
+static void
+thd_timer_destroy(thd_timer_t *ttp)
+{
+  DBUG_ENTER("thd_timer_destroy");
+
+  my_os_timer_delete(&ttp->timer);
+  pthread_mutex_destroy(&ttp->mutex);
+  my_free(ttp);
+
+  DBUG_VOID_RETURN;
+}
+
+
+/**
+  Notify a thread (session) that its timer has expired.
+
+  @param  ttp   Thread timer object.
+
+  @return true if the object should be destroyed.
+*/
+
+static bool
+timer_notify(thd_timer_t *ttp)
+{
+  THD *thd= ttp->thd;
+
+  DBUG_ASSERT(!ttp->destroy || !thd);
+
+  /*
+    Statement might have finished while the timer notification
+    was being delivered. If this is the case, the timer object
+    was detached (orphaned) and has no associated session (thd).
+  */
+  if (thd)
+  {
+    mysql_mutex_lock(&thd->LOCK_thd_data);
+    thd->awake(THD::KILL_TIMEOUT);
+    mysql_mutex_unlock(&thd->LOCK_thd_data);
+  }
+
+  /* Mark the object as unreachable. */
+  ttp->thd= NULL;
+
+  return ttp->destroy;
+}
+
+
+/**
+  Timer expiration notification callback.
+
+  @param  timer   Timer (mysys) object.
+
+  @note Invoked in a separate thread of control.
+*/
+
+static void
+timer_callback(my_timer_t *timer)
+{
+  bool destroy;
+  thd_timer_t *ttp;
+
+  ttp= my_container_of(timer, thd_timer_t, timer);
+
+  pthread_mutex_lock(&ttp->mutex);
+  destroy= timer_notify(ttp);
+  pthread_mutex_unlock(&ttp->mutex);
+
+  if (destroy)
+    thd_timer_destroy(ttp);
+}
+
+
+/**
+  Set the time until the currently running statement is aborted.
+
+  @param  thd   Thread (session) context.
+  @param  ttp   Thread timer object.
+  @param  time  Length of time, in milliseconds, until the currently
+                running statement is aborted.
+
+  @return NULL on failure.
+*/
+
+thd_timer_t *
+thd_timer_set(THD *thd, thd_timer_t *ttp, unsigned long time)
+{
+  DBUG_ENTER("thd_timer_set");
+
+  /* Create a new thread timer object if one was not provided. */
+  if (ttp == NULL && (ttp= thd_timer_create()) == NULL)
+    DBUG_RETURN(NULL);
+
+  DBUG_ASSERT(!ttp->destroy && !ttp->thd);
+
+  /* Mark the notification as pending. */
+  ttp->thd= thd;
+
+  /* Arm the timer. */
+  if (! my_os_timer_set(&ttp->timer, time))
+    DBUG_RETURN(ttp);
+
+  /* Dispose of the (cached) timer object. */
+  thd_timer_destroy(ttp);
+
+  DBUG_RETURN(NULL);
+}
+
+
+/**
+  Reap a (possibly) pending timer object.
+
+  @param  ttp   Thread timer object.
+
+  @return true if the timer object is unreachable.
+*/
+
+static bool
+reap_timer(thd_timer_t *ttp, bool pending)
+{
+  bool unreachable;
+
+  /* Cannot be tagged for destruction. */
+  DBUG_ASSERT(!ttp->destroy);
+
+  /* If not pending, timer hasn't fired. */
+  DBUG_ASSERT(pending || ttp->thd);
+
+  /*
+    The timer object can be reused if the timer was stopped before
+    expiring. Otherwise, the timer notification function might be
+    executing asynchronously in the context of a separate thread.
+  */
+  unreachable= pending ? ttp->thd == NULL : true;
+
+  ttp->thd= NULL;
+
+  return unreachable;
+}
+
+/**
+  Deactivate the given timer.
+
+  @param  ttp   Thread timer object.
+
+  @return NULL if the timer object was orphaned.
+          Otherwise, the given timer object is returned.
+*/
+
+thd_timer_t *
+thd_timer_reset(thd_timer_t *ttp)
+{
+  bool unreachable;
+  int status, state;
+  DBUG_ENTER("thd_timer_reset");
+
+  status= my_os_timer_reset(&ttp->timer, &state);
+
+  /*
+    If the notification function cannot possibly run anymore, cache
+    the timer object as there are no outstanding references to it.
+  */
+  pthread_mutex_lock(&ttp->mutex);
+  unreachable= reap_timer(ttp, status ? true : !state);
+  ttp->destroy= unreachable ? false : true;
+  pthread_mutex_unlock(&ttp->mutex);
+
+  DBUG_RETURN(unreachable ? ttp : NULL);
+}
+
+
+/**
+  Release resources allocated for a given thread timer.
+
+  @param  ttp   Thread timer object.
+*/
+
+void
+thd_timer_end(thd_timer_t *ttp)
+{
+  DBUG_ENTER("thd_timer_end");
+
+  thd_timer_destroy(ttp);
+
+  DBUG_VOID_RETURN;
+}
+

=== added file 'Percona-Server/sql/sql_timer.h'
--- Percona-Server/sql/sql_timer.h	1970-01-01 00:00:00 +0000
+++ Percona-Server/sql/sql_timer.h	2013-09-09 15:30:42 +0000
@@ -0,0 +1,50 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#ifndef SQL_TIMER_INCLUDED
+#define SQL_TIMER_INCLUDED
+
+class THD;
+struct st_thd_timer;
+typedef struct st_thd_timer thd_timer_t;
+
+#ifdef HAVE_MY_TIMER
+
+thd_timer_t *thd_timer_set(THD *, thd_timer_t *, unsigned long);
+thd_timer_t *thd_timer_reset(thd_timer_t *);
+void thd_timer_end(thd_timer_t *);
+
+#else
+
+static inline thd_timer_t *
+thd_timer_set(THD *, thd_timer_t *, unsigned long)
+{
+  return NULL;
+}
+
+static inline thd_timer_t *
+thd_timer_reset(thd_timer_t *)
+{
+  return NULL;
+}
+
+static inline void
+thd_timer_end(thd_timer_t *)
+{
+}
+
+#endif
+
+#endif /* SQL_TIMER_INCLUDED */

=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc	2013-09-09 07:01:33 +0000
+++ Percona-Server/sql/sys_vars.cc	2013-09-09 15:30:42 +0000
@@ -2928,6 +2928,12 @@
        sql_mode_names, DEFAULT(MODE_NO_ENGINE_SUBSTITUTION), NO_MUTEX_GUARD,
        NOT_IN_BINLOG, ON_CHECK(check_sql_mode), ON_UPDATE(fix_sql_mode));
 
+static Sys_var_ulong Sys_max_statement_time(
+       "max_statement_time",
+       "Kill any statement that takes over the specified number of milliseconds",
+       SESSION_VAR(max_statement_time), CMD_LINE(REQUIRED_ARG),
+       VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
+
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
 #define SSL_OPT(X) CMD_LINE(REQUIRED_ARG,X)
 #else
@@ -3966,6 +3972,10 @@
        "have_symlink", "have_symlink",
        READ_ONLY GLOBAL_VAR(have_symlink), NO_CMD_LINE);
 
+static Sys_var_have Sys_have_statement_timeout(
+       "have_statement_timeout", "have_statement_timeout",
+       READ_ONLY GLOBAL_VAR(have_statement_timeout), NO_CMD_LINE);
+
 static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type);
 static Sys_var_mybool Sys_general_log(
        "general_log", "Log connections and queries to a table or log file. "

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-08-30 13:23:53 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-09 15:30:42 +0000
@@ -42,6 +42,7 @@
 #include <my_base.h>	// HA_OPTION_*
 #include <mysys_err.h>
 #include <mysql/innodb_priv.h>
+#include <mysql/thread_pool_priv.h>
 
 /** @file ha_innodb.cc */
 
@@ -809,6 +810,15 @@
 					which to close the connection */
 
 /*****************************************************************//**
+Cancel any pending lock request associated with the current THD. */
+static
+void
+innobase_kill_connection(
+/*======================*/
+        handlerton*	hton,	/*!< in:  innobase handlerton */
+	THD*	thd);	/*!< in: handle to the MySQL thread being killed */
+
+/*****************************************************************//**
 Commits a transaction in an InnoDB database or marks an SQL statement
 ended.
 @return	0 */
@@ -1540,8 +1550,8 @@
 		return(0);
 
 	case DB_INTERRUPTED:
-		my_error(ER_QUERY_INTERRUPTED, MYF(0));
-		/* fall through */
+		thd_set_kill_status(thd ? thd : thd_get_current_thd());
+		return(-1);
 
 	case DB_FOREIGN_EXCEED_MAX_CASCADE:
 		ut_ad(thd);
@@ -3017,6 +3027,8 @@
 		= innobase_purge_changed_page_bitmaps;
 	innobase_hton->is_fake_change = innobase_is_fake_change;
 
+	innobase_hton->kill_connection = innobase_kill_connection;
+
 	ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
 #ifndef DBUG_OFF
@@ -4199,6 +4211,40 @@
 	return(ROW_TYPE_NOT_USED);
 }
 
+/*****************************************************************//**
+Cancel any pending lock request associated with the current THD. */
+static
+void
+innobase_kill_connection(
+/*======================*/
+        handlerton*	hton,	/*!< in:  innobase handlerton */
+	THD*	thd)	/*!< in: handle to the MySQL thread being killed */
+{
+	trx_t*	trx;
+
+	DBUG_ENTER("innobase_kill_connection");
+	DBUG_ASSERT(hton == innodb_hton_ptr);
+
+	lock_mutex_enter();
+
+	trx = thd_to_trx(thd);
+
+	if (trx)
+	{
+		trx_mutex_enter(trx);
+
+		/* Cancel a pending lock request. */
+		if (trx->lock.wait_lock)
+			lock_cancel_waiting_and_release(trx->lock.wait_lock);
+
+		trx_mutex_exit(trx);
+	}
+
+	lock_mutex_exit();
+
+	DBUG_VOID_RETURN;
+}
+
 
 
 /****************************************************************//**
@@ -11874,7 +11920,7 @@
 
 	prebuilt->trx->op_info = "";
 	if (thd_killed(user_thd)) {
-		my_error(ER_QUERY_INTERRUPTED, MYF(0));
+		thd_set_kill_status(user_thd);
 	}
 
 	if (UNIV_UNLIKELY(share->ib_table->is_corrupt)) {

=== modified file 'Percona-Server/storage/innobase/include/lock0lock.h'
--- Percona-Server/storage/innobase/include/lock0lock.h	2013-08-06 15:16:34 +0000
+++ Percona-Server/storage/innobase/include/lock0lock.h	2013-09-09 15:30:42 +0000
@@ -498,6 +498,16 @@
 lock_trx_release_locks(
 /*===================*/
 	trx_t*	trx);	/*!< in/out: transaction */
+
+/*********************************************************************//**
+Cancels a waiting lock request and releases possible other transactions
+waiting behind it. */
+UNIV_INTERN
+void
+lock_cancel_waiting_and_release(
+/*============================*/
+	lock_t*	lock);	/*!< in/out: waiting lock request */
+
 /*********************************************************************//**
 Removes locks on a table to be dropped or truncated.
 If remove_also_table_sx_locks is TRUE then table-level S and X locks are

=== modified file 'Percona-Server/storage/innobase/include/lock0priv.h'
--- Percona-Server/storage/innobase/include/lock0priv.h	2013-06-10 20:44:22 +0000
+++ Percona-Server/storage/innobase/include/lock0priv.h	2013-09-09 15:30:42 +0000
@@ -98,15 +98,6 @@
 	ulint		heap_no);/*!< in: heap number of the record */
 
 /*********************************************************************//**
-Cancels a waiting lock request and releases possible other transactions
-waiting behind it. */
-UNIV_INTERN
-void
-lock_cancel_waiting_and_release(
-/*============================*/
-	lock_t*	lock);	/*!< in/out: waiting lock request */
-
-/*********************************************************************//**
 Checks if some transaction has an implicit x-lock on a record in a clustered
 index.
 @return	transaction id of the transaction which has the x-lock, or 0 */

=== added directory 'Percona-Server/unittest/mysys'
=== added file 'Percona-Server/unittest/mysys/my_timer-t.c'
--- Percona-Server/unittest/mysys/my_timer-t.c	1970-01-01 00:00:00 +0000
+++ Percona-Server/unittest/mysys/my_timer-t.c	2013-09-09 15:30:42 +0000
@@ -0,0 +1,263 @@
+/* Copyright (c) 2012, Twitter, Inc. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "m_string.h"
+#include "my_timer.h"
+#include "thr_template.c"
+
+typedef struct
+{
+  my_timer_t timer;
+  unsigned int fired;
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+} test_timer_t;
+
+static void timer_notify_function(my_timer_t *timer)
+{
+  test_timer_t *test= my_container_of(timer, test_timer_t, timer);
+
+  pthread_mutex_lock(&test->mutex);
+  test->fired++;
+  pthread_cond_signal(&test->cond);
+  pthread_mutex_unlock(&test->mutex);
+}
+
+static void test_timer_create(test_timer_t *test)
+{
+  memset(test, 0, sizeof(test_timer_t));
+  pthread_mutex_init(&test->mutex, NULL);
+  pthread_cond_init(&test->cond, NULL);
+  ok(my_os_timer_create(&test->timer) == 0, "my_os_timer_create");
+  test->timer.notify_function= timer_notify_function;
+}
+
+static void test_timer_destroy(test_timer_t *test)
+{
+  pthread_mutex_destroy(&test->mutex);
+  pthread_cond_destroy(&test->cond);
+  my_os_timer_delete(&test->timer);
+}
+
+static void test_create_and_delete(void)
+{
+  int rc;
+  my_timer_t timer;
+
+  diag("test_create_and_delete");
+
+  memset(&timer, 0, sizeof(timer));
+
+  rc= my_os_timer_create(&timer);
+  ok(rc == 0, "my_os_timer_create");
+
+  my_os_timer_delete(&timer);
+}
+
+static void test_reset(void)
+{
+  int rc, state;
+  test_timer_t test;
+
+  diag("test_reset");
+
+  test_timer_create(&test);
+
+  rc= my_os_timer_set(&test.timer, 3600000U);
+  ok(rc == 0, "my_os_timer_set");
+
+  rc= my_os_timer_reset(&test.timer, &state);
+  ok(rc == 0, "my_os_timer_reset");
+
+  ok(state == 1, "timer state is nonsignaled");
+  ok(test.fired == 0, "timer has not fired");
+
+  test_timer_destroy(&test);
+}
+
+static void test_timer(void)
+{
+  int rc, state;
+  test_timer_t test;
+
+  diag("test_timer");
+
+  test_timer_create(&test);
+
+  pthread_mutex_lock(&test.mutex);
+
+  rc= my_os_timer_set(&test.timer, 5);
+  ok(rc == 0, "my_os_timer_set");
+
+  ok(test.fired == 0, "not fired yet");
+
+  while (!test.fired)
+    pthread_cond_wait(&test.cond, &test.mutex);
+
+  ok(test.fired == 1, "timer fired once");
+
+  rc= my_os_timer_reset(&test.timer, &state);
+  ok(rc == 0, "my_os_timer_reset");
+
+  ok(state == 0, "timer state was signaled");
+
+  pthread_mutex_unlock(&test.mutex);
+
+  test_timer_destroy(&test);
+}
+
+static void timer_set_and_wait(test_timer_t *test, unsigned int fired_count)
+{
+  int rc, state;
+
+  rc= my_os_timer_set(&test->timer, 5);
+  ok(rc == 0, "my_os_timer_set");
+
+  ok(test->fired != fired_count, "not fired yet");
+
+  while (test->fired != fired_count)
+    pthread_cond_wait(&test->cond, &test->mutex);
+
+  ok(test->fired == fired_count, "timer fired");
+
+  rc= my_os_timer_reset(&test->timer, &state);
+  ok(rc == 0, "my_os_timer_reset");
+
+  ok(state == 0, "timer state was signaled");
+}
+
+static void test_timer_reuse(void)
+{
+  test_timer_t test;
+
+  diag("test_timer_reuse");
+
+  test_timer_create(&test);
+
+  pthread_mutex_lock(&test.mutex);
+
+  timer_set_and_wait(&test, 1);
+  timer_set_and_wait(&test, 2);
+  timer_set_and_wait(&test, 3);
+
+  pthread_mutex_unlock(&test.mutex);
+
+  test_timer_destroy(&test);
+}
+
+static void test_independent_timers(void)
+{
+  int rc, state;
+  test_timer_t test;
+
+  diag("test_independent_timers");
+
+  test_timer_create(&test);
+
+  rc= my_os_timer_set(&test.timer, 3600000U);
+  ok(rc == 0, "my_os_timer_set");
+
+  test_timer();
+
+  rc= my_os_timer_reset(&test.timer, &state);
+  ok(rc == 0, "my_os_timer_reset");
+
+  ok(state == 1, "timer state is nonsignaled");
+  ok(test.fired == 0, "timer has not fired");
+
+  test_timer_destroy(&test);
+}
+
+static void test_timer_no_tap(void)
+{
+  int rc, state;
+  test_timer_t test;
+
+  memset(&test, 0, sizeof(test_timer_t));
+
+  pthread_mutex_init(&test.mutex, NULL);
+  pthread_cond_init(&test.cond, NULL);
+
+  test.timer.notify_function= timer_notify_function;
+
+  rc= my_os_timer_create(&test.timer);
+  assert(rc == 0);
+
+  pthread_mutex_lock(&test.mutex);
+
+  rc= my_os_timer_set(&test.timer, 5);
+  assert(rc == 0);
+
+  assert(test.fired == 0); /* not fired yet */
+
+  while (!test.fired)
+    pthread_cond_wait(&test.cond, &test.mutex);
+
+  assert(test.fired == 1); /* timer fired once */
+
+  rc= my_os_timer_reset(&test.timer, &state);
+  assert(rc == 0);
+
+  assert(state == 0); /* timer state was signaled */
+
+  pthread_mutex_unlock(&test.mutex);
+
+  pthread_mutex_destroy(&test.mutex);
+  pthread_cond_destroy(&test.cond);
+  my_os_timer_delete(&test.timer);
+}
+
+static pthread_handler_t test_timer_per_thread(void *arg)
+{
+  int iter= *(int *) arg;
+
+  while (iter--)
+    test_timer_no_tap();
+
+  pthread_mutex_lock(&mutex);
+  if (!--running_threads)
+    pthread_cond_signal(&cond);
+  pthread_mutex_unlock(&mutex);
+
+  return NULL;
+}
+
+static void test_reinitialization(void)
+{
+  diag("test_reinitialization");
+
+  my_os_timer_deinit();
+  ok(my_os_timer_init_ext() == 0, "my_os_timer_init_ext");
+  test_timer();
+  my_os_timer_deinit();
+  ok(my_os_timer_init_ext() == 0, "my_os_timer_init_ext");
+}
+
+void do_tests()
+{
+  plan(49);
+
+  ok(my_os_timer_init_ext() == 0, "my_os_timer_init_ext");
+
+  test_create_and_delete();
+  test_reset();
+  test_timer();
+  test_timer_reuse();
+  test_independent_timers();
+  test_concurrently("per-thread", test_timer_per_thread, THREADS, 5);
+  test_reinitialization();
+
+  my_os_timer_deinit();
+}