Merge lp:~skinny.moey/drizzle/bug755201 into lp:~drizzle-trunk/drizzle/development

Proposed by Joe Daly
Status: Merged
Approved by: Brian Aker
Approved revision: 2271
Merged at revision: 2276
Proposed branch: lp:~skinny.moey/drizzle/bug755201
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 11 lines (+1/-0)
1 file modified
plugin/slave/queue_producer.cc (+1/-0)
To merge this branch: bzr merge lp:~skinny.moey/drizzle/bug755201
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+57063@code.launchpad.net

Description of the change

bug 755201, ran ./dbqp --mode=randgen --randgen-path=/home/jdaly/drizzle/repos/randgen --suite=slave_plugin to test

To post a comment you must log in.
Revision history for this message
Joe Daly (skinny.moey) wrote :

This should probably go in elliott. Do I need to propose a separate merge to make sure it finds its way in there?

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

Grabbing this for Elliott

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/slave/queue_producer.cc'
--- plugin/slave/queue_producer.cc 2011-04-02 01:32:02 +0000
+++ plugin/slave/queue_producer.cc 2011-04-09 23:52:25 +0000
@@ -399,6 +399,7 @@
399 }399 }
400400
401 sql.append(")", 1);401 sql.append(")", 1);
402 sql.append(" ORDER BY `commit_id` ASC");
402403
403 drizzle_return_t ret;404 drizzle_return_t ret;
404 drizzle_result_st result;405 drizzle_result_st result;