Merge lp://qastaging/~percona-core/percona-xtradb-cluster/bug-1402338-5.5 into lp://qastaging/percona-xtradb-cluster/5.5
Proposed by
Raghavendra D Prabhu
| Status: | Approved |
|---|---|
| Approved by: | Raghavendra D Prabhu |
| Approved revision: | 839 |
| Proposed branch: | lp://qastaging/~percona-core/percona-xtradb-cluster/bug-1402338-5.5 |
| Merge into: | lp://qastaging/percona-xtradb-cluster/5.5 |
| Diff against target: |
32 lines (+17/-1) 1 file modified
sql/wsrep_mysqld.cc (+17/-1) |
| To merge this branch: | bzr merge lp://qastaging/~percona-core/percona-xtradb-cluster/bug-1402338-5.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Alexey Kopytov (akopytov) | # |
review:
Approve
Unmerged revisions
- 839. By Raghavendra D Prabhu
-
Refactored code for style
- 838. By Raghavendra D Prabhu
-
Bug#1402338 Port the fix from 5.6 tree for lp:1402338. mysql-test galera fixes not ported since they are not in 5.5
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good except:
- spurious indentation change for "int ret= 0;";
- code in wsrep_mysqld.cc follows MySQL coding guidelines, not InnoDB ones. This means "lex= ..." instead of "lex = ...", and the following "if ... else ..." formatting:
if ()
{
...
}
else
{
...
}