Drizzle Automation

Merge lp:~kalebral-deactivatedaccount/drizzle-automation/fix-sysbench-no-store-db into lp:drizzle-automation

  1. fix-sysbench-no-store-db
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Approved by: Patrick Crews
Approved revision: 227
Merged at revision: 227
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle-automation/fix-sysbench-no-store-db
Merge into: lp:drizzle-automation
Diff against target: 28 lines (+4/-3)
2 files modified
drizzle/automation/lib/db.py (+1/-1)
drizzle/automation/sysbench/run.py (+3/-2)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle-automation/fix-sysbench-no-store-db
Reviewer Review Type Date Requested Status
Patrick Crews Approve
Review via email: mp+48747@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Patrick Crews (patrick-crews) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzle/automation/lib/db.py'
2--- drizzle/automation/lib/db.py 2011-01-27 16:05:37 +0000
3+++ drizzle/automation/lib/db.py 2011-02-07 04:11:34 +0000
4@@ -163,7 +163,7 @@
5 run_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
6 , config_id INT NOT NULL
7 , server VARCHAR(20) NOT NULL
8-, version VARCHAR(50) NULL
9+, version VARCHAR(60) NULL
10 , run_date DATETIME NOT NULL
11 ) ENGINE=InnoDB;
12
13
14=== modified file 'drizzle/automation/sysbench/run.py'
15--- drizzle/automation/sysbench/run.py 2011-01-18 00:07:57 +0000
16+++ drizzle/automation/sysbench/run.py 2011-02-07 04:11:34 +0000
17@@ -320,8 +320,9 @@
18
19 concurrency_levels= sysbench.getConcurrencyLevels(sysbench_config_variables, bench_config_name)
20 iterations= sysbench.getIterations(sysbench_config_variables, bench_config_name)
21- run_id= util.getNextRunId()
22- config_id= util.getConfigId(bench_config_name)
23+ if variables['no_store_db'] is False:
24+ run_id= util.getNextRunId()
25+ config_id= util.getConfigId(bench_config_name)
26
27 # Run the benchmarks for the specified config
28 for concurrency in concurrency_levels:

Subscribers

People subscribed via source and target branches

to all changes: