lp:~vlad-lesin/percona-server/sql_timeout

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:percona-server/5.5

Laurynas Biveinis (community): Needs Fixing on 2012-09-07

Vlad Lesin (community): Needs Resubmitting on 2012-02-17

Alexey Kopytov (community): Needs Fixing on 2012-02-11

Vadim Tkachenko: Needs Fixing on 2012-01-23

Diff: 1169 lines (+910/-4)

16 files modified

Percona-Server/mysql-test/r/mysqld--help-notwin.result (+2/-0)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+1/-0)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+1/-0)
Percona-Server/mysql-test/r/percona_sql_timeout.result (+120/-0)
Percona-Server/mysql-test/suite/sys_vars/r/sql_timeout_basic.result (+164/-0)
Percona-Server/mysql-test/suite/sys_vars/t/sql_timeout_basic.test (+210/-0)
Percona-Server/mysql-test/t/percona_sql_timeout.test (+44/-0)
Percona-Server/sql/CMakeLists.txt (+1/-1)
Percona-Server/sql/mysqld.cc (+59/-2)
Percona-Server/sql/mysqld.h (+5/-1)
Percona-Server/sql/sql_class.cc (+5/-0)
Percona-Server/sql/sql_class.h (+6/-0)
Percona-Server/sql/sql_parse.cc (+3/-0)
Percona-Server/sql/sql_timeout.cc (+228/-0)
Percona-Server/sql/sql_timeout.h (+55/-0)
Percona-Server/sql/sys_vars.cc (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

237. By Vlad Lesin on 2012-04-26

Get SQL_TIMEOUT=X variable to make queries automatically be killed
when they are taking too long time.
Example:
SET SQL_TIMEOUT=10;
SELECT SLEEP(20);

The query will be killed in 10 seconds.

236. By Hrvoje Matijakovic on 2012-04-24

* merged lp:~hrvojem/percona-server/rn-5.5.22-25.2

235. By Stewart Smith on 2012-04-22

merge 5.5.22 as bzr branch

234. By Hrvoje Matijakovic on 2012-04-12

* merged lp:~hrvojem/percona-server/theme-fix-5.5

233. By Hrvoje Matijakovic on 2012-03-29

* merged lp:~hrvojem/percona-server/theme-update.5.5

232. By Hrvoje Matijakovic on 2012-03-28

* merged lp:~hrvojem/percona-server/rn-25.1

231. By Laurynas Biveinis on 2012-03-28

Automerge lp:~stewart/percona-server/bug966844

230. By Laurynas Biveinis on 2012-03-28

Automerge lp:~laurynas-biveinis/percona-server/staging-5.5

229. By Hrvoje Matijakovic on 2012-03-27

* merged lp:~hrvojem/percona-server/bug955266-5.5

228. By Ignacio Nin on 2012-03-27

Merge from release branch 5.5.21-25.0