Merge lp://qastaging/~olafvdspek/drizzle/rf1 into lp://qastaging/drizzle

Proposed by Olaf van der Spek
Status: Needs review
Proposed branch: lp://qastaging/~olafvdspek/drizzle/rf1
Merge into: lp://qastaging/drizzle
Diff against target: 397 lines (+49/-150)
3 files modified
drizzled/error/sql_state.cc (+4/-9)
drizzled/error/sql_state.h (+3/-5)
drizzled/table/instance/base.cc (+42/-136)
To merge this branch: bzr merge lp://qastaging/~olafvdspek/drizzle/rf1
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+118245@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Aker (brianaker) wrote :

Style-wise, we use {} in all cases. This patch removes that in a few cases.

This is for readability.

Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

Do we? Coding standards doesn't mention it. It even contains a few examples that don't.

Revision history for this message
Brian Aker (brianaker) wrote :

This is something that Trond slipped up on at one point. I thought we had updated the style guide for this.

Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

Where did I remove the braces?

Revision history for this message
Olaf van der Spek (olafvdspek) wrote :

Ah, I found one if statement. Do you want me to update the patch?

--
Olaf

Unmerged revisions

2579. By Olaf van der Spek

Refactor

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches