Merge lp:~laurynas-biveinis/percona-server/bug1064326-5.5 into lp:percona-server/5.5
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Stewart Smith |
Approved revision: | no longer in the source branch. |
Merged at revision: | 338 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug1064326-5.5 |
Merge into: | lp:percona-server/5.5 |
Prerequisite: | lp:~laurynas-biveinis/percona-server/bug890404-5.5 |
Diff against target: |
442 lines (+128/-122) 11 files modified
Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result (+0/-19) 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/suite/sys_vars/r/innodb_locking_fake_changes_basic.result (+52/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_locking_fake_changes_basic.test (+44/-0) Percona-Server/mysql-test/t/percona_innodb_fake_changes.test (+0/-75) Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test (+0/-24) Percona-Server/storage/innobase/handler/ha_innodb.cc (+8/-0) Percona-Server/storage/innobase/include/srv0srv.h (+4/-0) Percona-Server/storage/innobase/lock/lock0lock.c (+14/-4) Percona-Server/storage/innobase/srv/srv0srv.c (+4/-0) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug1064326-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Approve | ||
Review via email: mp+129425@code.launchpad.net |
Description of the change
Merge bug 1064326 fix from 5.1.
Resolve fileids and adjust InnoDB check for
percona_
sys_vars/
http://
26611
To post a comment you must log in.