Merge lp:~kalebral-deactivatedaccount/drizzle-automation/drizzled-start-options-protocol into lp:drizzle-automation

[Lee Bieber]

Changes needed to start drizzled with the recent protocol updates from Eric

[Jay Pipes (jaypipes)]

review: Approve

=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf'
--- drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf	2010-03-09 02:31:09 +0000
+++ drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf	2010-03-16 18:41:17 +0000
@@ -56,3 +56,4 @@
 drizzle-table-engine= innodb 
 oltp-read-only= on 
 oltp-table-size= 1000000
+drizzle-mysql= on

=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf'
--- drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf	2010-03-09 02:31:09 +0000
+++ drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf	2010-03-16 18:41:17 +0000
@@ -56,3 +56,4 @@
 drizzle-table-engine= innodb 
 oltp-read-only= off
 oltp-table-size= 1000000
+drizzle-mysql= on

=== modified file 'drizzle/automation/server/drizzled.py'
--- drizzle/automation/server/drizzled.py	2009-11-15 20:09:36 +0000
+++ drizzle/automation/server/drizzled.py	2010-03-16 18:41:17 +0000
@@ -81,7 +81,7 @@
       start_cmd= self._profiler.getStartCmdPrefix() + " "
     else:
       start_cmd= ""
-    start_cmd= start_cmd + "%s --drizzle-protocol-port=%d --mysql-protocol-port=%d --basedir=%s --datadir=%s %s > error.log 2>&1 &" % (os.path.join(self._basedir, "drizzled", "drizzled")
+    start_cmd= start_cmd + "%s --mysql-protocol-port=%d --drizzle-protocol-port=%d --basedir=%s --datadir=%s %s > error.log 2>&1 &" % (os.path.join(self._basedir, "drizzled", "drizzled")
                                                                 , self._port
                                                                 , self._port+1
                                                                 , self._basedir