Merge lp:~mdcallag/sysbench/trunk into lp:~sysbench-developers/sysbench/trunk

Proposed by Mark Callaghan
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 70
Merged at revision: not available
Proposed branch: lp:~mdcallag/sysbench/trunk
Merge into: lp:~sysbench-developers/sysbench/trunk
Diff against target: 12 lines
1 file modified
sysbench/sysbench.c (+1/-1)
To merge this branch: bzr merge lp:~mdcallag/sysbench/trunk
Reviewer Review Type Date Requested Status
Alexey Kopytov Approve
Review via email: mp+12814@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mark Callaghan (mdcallag) wrote :

This fixes a bug from my previous merge

Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sysbench/sysbench.c'
--- sysbench/sysbench.c 2009-09-30 18:03:53 +0000
+++ sysbench/sysbench.c 2009-10-03 00:05:18 +0000
@@ -619,7 +619,7 @@
619 sb_globals.validate = sb_get_value_flag("validate");619 sb_globals.validate = sb_get_value_flag("validate");
620620
621 rand_init = sb_get_value_flag("rand-init"); 621 rand_init = sb_get_value_flag("rand-init");
622 rand_seed = sb_get_value_flag("rand-seed"); 622 rand_seed = sb_get_value_int("rand-seed");
623 if (rand_init && rand_seed)623 if (rand_init && rand_seed)
624 {624 {
625 log_text(LOG_FATAL, "Cannot set both --rand-init and --rand-seed");625 log_text(LOG_FATAL, "Cannot set both --rand-init and --rand-seed");

Subscribers

People subscribed via source and target branches