Merge lp://qastaging/~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5 into lp://qastaging/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: | 684 | ||||||||||||
| Proposed branch: | lp://qastaging/~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5 | ||||||||||||
| Merge into: | lp://qastaging/percona-server/5.5 | ||||||||||||
| Diff against target: |
60 lines (+0/-17) 4 files modified
sql/handler.h (+0/-4) sql/sql_show.cc (+0/-2) storage/innobase/handler/ha_innodb.cc (+0/-10) storage/innobase/handler/ha_innodb.h (+0/-1) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Laurynas Biveinis (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix assorted minor issues discovered in the 5.6 porting and its code review.
673. By Laurynas Biveinis 14 hours ago
Fix bug 1182050 (Duplicate LIST_PROCESS_
removing a copy from sql_show.cc, so that there is only one definition
and that upstream changes to it result in a merge conflict.
672. By Laurynas Biveinis 14 hours ago
Fix bug 1182072 (Unused ha_innobase:
it.
671. By Laurynas Biveinis 14 hours ago
Fix bug 1182046 (Unnecessary MAX_KEY <= 128 compile-time check in
userstat) by removing the check.
http://
To post a comment you must log in.
Revision history for this message
| Laurynas Biveinis (laurynas-biveinis) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
