Merge lp:~kalebral-deactivatedaccount/drizzle-automation/sysbench-report-fix into lp:drizzle-automation

[Lee Bieber]

[Patrick Crews (patrick-crews)]

review: Approve

=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf'
--- drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf	2010-10-11 04:31:43 +0000
+++ drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf	2010-12-13 05:04:52 +0000
@@ -10,6 +10,7 @@
 innodb.additional-mem-pool-size= 16M
 table-open-cache= 4096
 table-definition-cache= 4096
+mysql-protocol.max-connections=2048
 
 [mysqld]
 
 
=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf'
--- drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf	2010-10-11 04:31:43 +0000
+++ drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf	2010-12-13 05:04:52 +0000
@@ -10,6 +10,7 @@
 innodb.additional-mem-pool-size= 16M
 table-open-cache= 4096
 table-definition-cache= 4096
+mysql-protocol.max-connections=2048
 
 [mysqld]
 
 
=== modified file 'drizzle/automation/reports/sysbench.py'
--- drizzle/automation/reports/sysbench.py	2010-11-12 23:27:46 +0000
+++ drizzle/automation/reports/sysbench.py	2010-12-13 05:04:52 +0000
@@ -282,10 +282,11 @@
   report_text= report_text + """
 ====================================================================================================
 """
-  results= getRegressionOverRange(run_id, last_5_revs)
-  for result in results:
-    report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
-  report_text= report_text + """====================================================================================================
+  if len(last_5_revs) > 0:
+    results= getRegressionOverRange(run_id, last_5_revs)
+    for result in results:
+      report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
+    report_text= report_text + """====================================================================================================
 
 TRENDING OVER Last 20 runs %s
 
@@ -297,19 +298,20 @@
   report_text= report_text + """
 ====================================================================================================
 """
-  results= getRegressionOverRange(run_id, last_20_revs)
-  for result in results:
-    report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
+  if len(last_20_revs) > 0:
+    results= getRegressionOverRange(run_id, last_20_revs)
+    for result in results:
+      report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
 
-  report_text= report_text + """====================================================================================================
+    report_text= report_text + """====================================================================================================
 
 TRENDING OVER ALL runs %s
 
 """ % (
     report_notation
 )
-  report_text= report_text + "%-6s %-7s %-17s %-10s %-10s %-10s %-10s %-10s" % ("Conc","TPS","% Diff from Avg","Diff","Min","Max","Avg","STD")
-  report_text= report_text + """
+    report_text= report_text + "%-6s %-7s %-17s %-10s %-10s %-10s %-10s %-10s" % ("Conc","TPS","% Diff from Avg","Diff","Min","Max","Avg","STD")
+    report_text= report_text + """
 ====================================================================================================
 """