Drizzle

Merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-810388 into lp://qastaging/~drizzle-trunk/drizzle/development

  1. trunk-bug-810388
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
Approved revision: 2368
Merged at revision: 2371
Proposed branch: lp://qastaging/~linuxjedi/drizzle/trunk-bug-810388
Merge into: lp://qastaging/~drizzle-trunk/drizzle/development
Diff against target: 65 lines (+10/-6)
2 files modified
libdrizzle-1.0/libdrizzle/column.c (+5/-3)
libdrizzle-2.0/libdrizzle/column.cc (+5/-3)
To merge this branch: bzr merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-810388
Reviewer Review Type Date Requested Status
Mark Atwood Approve
Drizzle Merge Team Pending
Review via email: mp+67943@code.qastaging.launchpad.net

Description of the change

Push of drizzle_column_skip fixes upstream to Drizzle:

1. the SKIP flag isn't removed after the skip
2. the state loop is pushed instead of popped

To post a comment you must log in.
Revision history for this message
Mark Atwood (fallenpegasus) wrote :

Fail Jenkins

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-windows/267/console

review: Approve
Revision history for this message
Monty Taylor (mordred) wrote :

Hehe. You're so happy we have a windows builder building that libdrizzle
code...

On 07/16/2011 07:11 PM, Mark Atwood wrote:
> Review: Approve
> Fail Jenkins
>
> http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-windows/267/console

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

I hit the same thing in Visual Studio 2008 yesterday (along with many other problems, I need to upgrade). The fix is to move the 'ret' declaration to the top of the function. I'll try and sort it next week.

lp://qastaging/~linuxjedi/drizzle/trunk-bug-810388 updated
2369. By Andrew Hutchings

Fixup drizzle_column_skip for Windows

Revision history for this message
Andrew Hutchings (linuxjedi) wrote :

ok, this should work in Visual Studio now

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.