Merge lp:~laurynas-biveinis/percona-server/bug901060-5.5 into lp:percona-server/5.5
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 372 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug901060-5.5 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
340 lines (+144/-147) 10 files modified
Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc (+0/-2) Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result (+0/-41) Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result (+0/-45) Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc (+2/-0) Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result (+39/-0) Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result (+45/-0) Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test (+27/-0) Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test (+31/-0) Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test (+0/-28) Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test (+0/-31) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug901060-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+139662@code.launchpad.net |
Description of the change
Obvious merge of bug 901060 from 5.1 with file-id resolution.
http://
To post a comment you must log in.