kewpie

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

  1. qp-fixes
  2. Merge into trunk
Proposed by Davi Arnaut
Status: Merged
Approved by: Patrick Crews
Approved revision: 126
Merged at revision: 125
Proposed branch: lp:~davi/kewpie/qp-fixes
Merge into: lp:kewpie
Diff against target: 34 lines (+8/-5)
2 files modified
lib/server_mgmt/mysqld.py (+3/-3)
percona_tests/innodbCrash/innodbCrash2_test.py (+5/-2)
To merge this branch: bzr merge lp:~davi/kewpie/qp-fixes
Reviewer Review Type Date Requested Status
Patrick Crews Approve
Review via email: mp+97084@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Patrick Crews (patrick-crews) wrote :

Awesome. Thanks for the patch : )

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/server_mgmt/mysqld.py'
2--- lib/server_mgmt/mysqld.py 2012-02-07 22:47:28 +0000
3+++ lib/server_mgmt/mysqld.py 2012-03-12 18:35:28 +0000
4@@ -245,9 +245,9 @@
5 , "--tmpdir=%s" %(self.tmpdir)
6 , "--character-sets-dir=%s" %(self.charsetdir)
7 , self.langstring
8- , "--ssl-ca=%s" %(os.path.join(self.std_data,'cacert.pem'))
9- , "--ssl-cert=%s" %(os.path.join(self.std_data,'server-cert.pem'))
10- , "--ssl-key=%s" %(os.path.join(self.std_data,'server-key.pem'))
11+ , "--loose-ssl-ca=%s" %(os.path.join(self.std_data,'cacert.pem'))
12+ , "--loose-ssl-cert=%s" %(os.path.join(self.std_data,'server-cert.pem'))
13+ , "--loose-ssl-key=%s" %(os.path.join(self.std_data,'server-key.pem'))
14 , "--port=%d" %(self.master_port)
15 , "--socket=%s" %(self.socket_file)
16 , "--pid-file=%s" %(self.pid_file)
17
18=== modified file 'percona_tests/innodbCrash/innodbCrash2_test.py'
19--- percona_tests/innodbCrash/innodbCrash2_test.py 2011-12-13 00:54:36 +0000
20+++ percona_tests/innodbCrash/innodbCrash2_test.py 2012-03-12 18:35:28 +0000
21@@ -123,8 +123,11 @@
22 for w in workers:
23 w.join()
24 time.sleep(2)
25- while randgen_process.poll():
26- randgen_process.send_signal(signal.SIGINT)
27+ while randgen_process.poll() is None:
28+ try:
29+ randgen_process.send_signal(signal.SIGINT)
30+ except OSError, e:
31+ pass
32
33 retcode = self.master_server.start()
34 timeout = 300

Subscribers

People subscribed via source and target branches

to all changes: