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

[Lee Bieber]

[Patrick Crews (patrick-crews)]

review: Approve

=== modified file 'drizzle/automation/lib/db.py'
--- drizzle/automation/lib/db.py	2011-01-27 16:05:37 +0000
+++ drizzle/automation/lib/db.py	2011-02-07 04:11:34 +0000
@@ -163,7 +163,7 @@
   run_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
 , config_id INT NOT NULL
 , server VARCHAR(20) NOT NULL
-, version VARCHAR(50) NULL
+, version VARCHAR(60) NULL
 , run_date DATETIME NOT NULL
 ) ENGINE=InnoDB;
 
 
=== modified file 'drizzle/automation/sysbench/run.py'
--- drizzle/automation/sysbench/run.py	2011-01-18 00:07:57 +0000
+++ drizzle/automation/sysbench/run.py	2011-02-07 04:11:34 +0000
@@ -320,8 +320,9 @@
 
   concurrency_levels= sysbench.getConcurrencyLevels(sysbench_config_variables, bench_config_name)
   iterations= sysbench.getIterations(sysbench_config_variables, bench_config_name)
-  run_id= util.getNextRunId()
-  config_id= util.getConfigId(bench_config_name)
+  if variables['no_store_db'] is False:
+    run_id= util.getNextRunId()
+    config_id= util.getConfigId(bench_config_name)
 
   # Run the benchmarks for the specified config
   for concurrency in concurrency_levels: