Drizzle

Merge lp://qastaging/~barry-leslie/drizzle/drizzle_pbms into lp://qastaging/~drizzle-trunk/drizzle/development

  1. drizzle_pbms
  2. Merge into development
Proposed by Barry Leslie
Status: Merged
Approved by: Brian Aker
Approved revision: 1972
Merged at revision: 2379
Proposed branch: lp://qastaging/~barry-leslie/drizzle/drizzle_pbms
Merge into: lp://qastaging/~drizzle-trunk/drizzle/development
Diff against target: 43 lines (+1/-5)
3 files modified
plugin/pbms/src/backup_ms.cc (+0/-2)
plugin/pbms/src/cslib/CSStrUtil.h (+0/-1)
plugin/pbms/src/database_ms.cc (+1/-2)
To merge this branch: bzr merge lp://qastaging/~barry-leslie/drizzle/drizzle_pbms
Reviewer Review Type Date Requested Status
Mark Atwood Needs Fixing
Drizzle Merge Team Pending
Review via email: mp+69497@code.qastaging.launchpad.net

Description of the change

Fixed some compiler warnings.
Bug #806416

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

Fail in Jenkins Build testing

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.10-32bit/1003/console

../plugin/pbms/src/backup_ms.cc: In member function 'virtual bool MSBackup::doWork()':
../plugin/pbms/src/backup_ms.cc:493: error: 'src_repo_id' was not declared in this scope

Please fix and resubmit.

review: Needs Fixing
Revision history for this message
Barry Leslie (barry-leslie) wrote :

I think you must have a merge error. There is no src_repo_id at line ../plugin/pbms/src/backup_ms.cc:493 in this branch.

Barry

Revision history for this message
Mark Atwood (fallenpegasus) wrote :

That reference to src_repo_id seems to have been added by Brian as part of some cleanup he was doing. I have removed it, and am running this thru Jenkins again.

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.