Merge lp:~davi/kewpie/qp-fixes into lp:kewpie

[Davi Arnaut]

[Patrick Crews (patrick-crews)]

Awesome. Thanks for the patch : )

review: Approve

=== modified file 'lib/server_mgmt/mysqld.py'
--- lib/server_mgmt/mysqld.py	2012-02-07 22:47:28 +0000
+++ lib/server_mgmt/mysqld.py	2012-03-12 18:35:28 +0000
@@ -245,9 +245,9 @@
                       , "--tmpdir=%s"  %(self.tmpdir)
                       , "--character-sets-dir=%s" %(self.charsetdir)
                       , self.langstring
-                      , "--ssl-ca=%s" %(os.path.join(self.std_data,'cacert.pem'))
-                      , "--ssl-cert=%s" %(os.path.join(self.std_data,'server-cert.pem'))
-                      , "--ssl-key=%s" %(os.path.join(self.std_data,'server-key.pem'))
+                      , "--loose-ssl-ca=%s" %(os.path.join(self.std_data,'cacert.pem'))
+                      , "--loose-ssl-cert=%s" %(os.path.join(self.std_data,'server-cert.pem'))
+                      , "--loose-ssl-key=%s" %(os.path.join(self.std_data,'server-key.pem'))
                       , "--port=%d" %(self.master_port)
                       , "--socket=%s" %(self.socket_file)
                       , "--pid-file=%s" %(self.pid_file)
 
=== modified file 'percona_tests/innodbCrash/innodbCrash2_test.py'
--- percona_tests/innodbCrash/innodbCrash2_test.py	2011-12-13 00:54:36 +0000
+++ percona_tests/innodbCrash/innodbCrash2_test.py	2012-03-12 18:35:28 +0000
@@ -123,8 +123,11 @@
             for w in workers:
               w.join()
             time.sleep(2)
-            while randgen_process.poll():
-                randgen_process.send_signal(signal.SIGINT)
+            while randgen_process.poll() is None:
+                try:
+                    randgen_process.send_signal(signal.SIGINT)
+                except OSError, e:
+                    pass
 
             retcode = self.master_server.start()
             timeout = 300