lp:~vlad-lesin/percona-server/5.6-sql_timeout
Created by
Vlad Lesin
and last modified
- Get this branch:
- bzr branch lp:~vlad-lesin/percona-server/5.6-sql_timeout
Only
Vlad Lesin
can upload to this branch. If you are
Vlad Lesin
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:percona-server/5.6
- Alexey Kopytov (community): Needs Fixing
-
Diff: 3089 lines (+857/-266)61 files modifiedPercona-Server/mysql-test/r/mysqld--help-notwin.result (+2/-0)
Percona-Server/mysql-test/r/percona_sql_timeout.result (+120/-0)
Percona-Server/mysql-test/suite/sys_vars/r/sql_timeout_basic.result (+151/-0)
Percona-Server/mysql-test/suite/sys_vars/t/sql_timeout_basic.test (+194/-0)
Percona-Server/mysql-test/t/percona_sql_timeout.test (+82/-0)
Percona-Server/sql/binlog.cc (+3/-3)
Percona-Server/sql/debug_sync.cc (+12/-12)
Percona-Server/sql/event_queue.cc (+3/-3)
Percona-Server/sql/event_scheduler.cc (+1/-1)
Percona-Server/sql/filesort.cc (+4/-7)
Percona-Server/sql/ha_ndbcluster.cc (+12/-12)
Percona-Server/sql/ha_ndbcluster_binlog.cc (+14/-14)
Percona-Server/sql/handler.cc (+5/-5)
Percona-Server/sql/item_func.cc (+10/-5)
Percona-Server/sql/item_subselect.cc (+1/-1)
Percona-Server/sql/lock.cc (+2/-2)
Percona-Server/sql/log.cc (+2/-2)
Percona-Server/sql/log_event.cc (+1/-1)
Percona-Server/sql/mysqld.cc (+2/-2)
Percona-Server/sql/opt_range.cc (+1/-1)
Percona-Server/sql/records.cc (+3/-3)
Percona-Server/sql/rpl_gtid_execution.cc (+2/-2)
Percona-Server/sql/rpl_gtid_state.cc (+1/-1)
Percona-Server/sql/rpl_master.cc (+2/-2)
Percona-Server/sql/rpl_rli.cc (+5/-5)
Percona-Server/sql/rpl_rli_pdb.cc (+9/-9)
Percona-Server/sql/rpl_slave.cc (+9/-9)
Percona-Server/sql/signal_handler.cc (+1/-1)
Percona-Server/sql/sp.cc (+2/-2)
Percona-Server/sql/sp_head.cc (+6/-6)
Percona-Server/sql/sp_instr.cc (+1/-1)
Percona-Server/sql/sp_rcontext.cc (+1/-1)
Percona-Server/sql/sql_admin.cc (+1/-1)
Percona-Server/sql/sql_base.cc (+5/-5)
Percona-Server/sql/sql_cache.cc (+2/-2)
Percona-Server/sql/sql_class.cc (+15/-14)
Percona-Server/sql/sql_class.h (+31/-4)
Percona-Server/sql/sql_connect.cc (+4/-4)
Percona-Server/sql/sql_db.cc (+5/-5)
Percona-Server/sql/sql_delete.cc (+8/-8)
Percona-Server/sql/sql_executor.cc (+12/-12)
Percona-Server/sql/sql_insert.cc (+27/-27)
Percona-Server/sql/sql_join_buffer.cc (+4/-4)
Percona-Server/sql/sql_load.cc (+9/-9)
Percona-Server/sql/sql_optimizer.cc (+2/-2)
Percona-Server/sql/sql_parse.cc (+20/-12)
Percona-Server/sql/sql_planner.cc (+2/-2)
Percona-Server/sql/sql_prepare.cc (+1/-1)
Percona-Server/sql/sql_reload.cc (+2/-2)
Percona-Server/sql/sql_servers.cc (+3/-3)
Percona-Server/sql/sql_show.cc (+5/-5)
Percona-Server/sql/sql_table.cc (+3/-3)
Percona-Server/sql/sql_update.cc (+8/-8)
Percona-Server/sql/sys_vars.cc (+6/-0)
Percona-Server/sql/table.cc (+1/-1)
Percona-Server/storage/innobase/row/row0mysql.cc (+1/-1)
Percona-Server/storage/myisam/ha_myisam.cc (+6/-6)
Percona-Server/storage/myisam/mi_check.c (+5/-5)
Percona-Server/storage/myisam/myisamchk.c (+2/-4)
Percona-Server/storage/myisam/myisamdef.h (+1/-1)
Percona-Server/storage/myisam/sort.c (+2/-2)
Related bugs
Related blueprints
Branch information
- Owner:
- Vlad Lesin
- Status:
- Development
Recent revisions
- 311. By Vlad Lesin
-
New system variable "SQL_TIMEOUT" allows to set limit for query execution time.
If this limit is exceeded the query is killed. SQL_TIMEOUT can be global or
session variable.The timeout expiration is checked on each db-thread killed state check. If timeout
expires the function that returns thread killed status will return the value which
corresponds to "killed query" status. - 303. By Stewart Smith
-
null merge innodb_
admin_command_ base.patch as it was only used for manual LRU dump/restore and this is now native in MySQL 5.6 - 302. By Stewart Smith
-
null merge innodb_
recovery_ patches. patch - two bug fixes have been broken out into separate commits and we aren't bringing innodb_ recovery_ stats forward to PS 5.6
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)