Merge lp://staging/~longbow/percona-server/ps55_log_slow_rate_limit into lp://staging/percona-server/5.5
Proposed by
Valentine Gostev
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | Laurynas Biveinis | ||||
| Proposed branch: | lp://staging/~longbow/percona-server/ps55_log_slow_rate_limit | ||||
| Merge into: | lp://staging/percona-server/5.5 | ||||
| Diff against target: |
878 lines (+853/-0) (has conflicts) 3 files modified
mysql-test/percona_server_variables_debug.result.OTHER (+371/-0) mysql-test/percona_server_variables_release.result.OTHER (+368/-0) patches/slow_extended.patch (+114/-0) Conflict adding files to mysql-test. Created directory. Conflict because mysql-test is not versioned, but has versioned children. Versioned directory. Contents conflict in mysql-test/percona_server_variables_debug.result Contents conflict in mysql-test/percona_server_variables_release.result Text conflict in patches/slow_extended.patch |
||||
| To merge this branch: | bzr merge lp://staging/~longbow/percona-server/ps55_log_slow_rate_limit | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Percona core | Pending | ||
|
Review via email:
|
|||
Description of the change
Added test for log_slow_rate_limit variable
To post a comment you must log in.
Unmerged revisions
- 155. By Valentine Gostev
-
Added functional test for log_slow_rate_limit
- 154. By Valentine Gostev
-
Merging back recent changes from trunk
- 153. By longbow <longbow@mil-nb>
-
Added test for log_slow_rate_limit variable
- 152. By Stewart Smith
-
merge 5.5.15 rebase
- 151. By Stewart Smith
-
use S3 download site
- 150. By Stewart Smith
-
merge a few quilt related fixes to misc scripts we use
- 149. By Stewart Smith
-
merge atomic_cas_64 fix
- 148. By Stewart Smith
-
merge compiler warning fix for innodb comparison of unsigned expression always true
- 147. By Stewart Smith
-
merge fix of innodb_bug60049 test failure. The master thread should purge if purge_thread seems already exited in shutdown state.
- 146. By Stewart Smith
-
update percona_
server_ variables_ debug.result for disabled INNODB_FAKE_CHANGES and KILL_IDLE_ TRANSACTION
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
