Merge lp:~stewart/kewpie/no-user-to-mysqld into lp:kewpie

Proposed by Stewart Smith
Status: Merged
Approved by: Patrick Crews
Approved revision: 82
Merged at revision: 84
Proposed branch: lp:~stewart/kewpie/no-user-to-mysqld
Merge into: lp:kewpie
Diff against target: 59 lines (+0/-6)
3 files modified
lib/server_mgmt/galera.py (+0/-2)
lib/server_mgmt/mysqld.py (+0/-2)
lib/server_mgmt/percona.py (+0/-2)
To merge this branch: bzr merge lp:~stewart/kewpie/no-user-to-mysqld
Reviewer Review Type Date Requested Status
Patrick Crews Approve
Review via email: mp+87057@code.launchpad.net

Description of the change

if we specify --user to mysqld we may end up not being able to start mysqld with a "user doesn't exist" if the system doesn't have a mysql user.

To post a comment you must log in.
Revision history for this message
Patrick Crews (patrick-crews) wrote :

Looks good and thank you for doing this. Was just thinking this needed doing \o/

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/galera.py'
2--- lib/server_mgmt/galera.py 2011-12-23 00:31:12 +0000
3+++ lib/server_mgmt/galera.py 2011-12-29 05:14:23 +0000
4@@ -130,7 +130,6 @@
5 self.secure_file_string = ''
6 else:
7 self.secure_file_string = "--secure-file-priv='%s'" %(self.vardir)
8- self.user_string = '--user=root'
9
10 self.initialize_databases()
11 self.take_db_snapshot()
12@@ -276,7 +275,6 @@
13 # the server-id=0 and no replication thing...
14 , "--server-id=%d" %(self.get_numeric_server_id()+1)
15 , self.secure_file_string
16- , self.user_string
17 ]
18 self.gen_cnf_file(server_args)
19
20
21=== modified file 'lib/server_mgmt/mysqld.py'
22--- lib/server_mgmt/mysqld.py 2011-12-23 00:31:12 +0000
23+++ lib/server_mgmt/mysqld.py 2011-12-29 05:14:23 +0000
24@@ -135,7 +135,6 @@
25 self.secure_file_string = ''
26 else:
27 self.secure_file_string = "--secure-file-priv='%s'" %(self.vardir)
28- self.user_string = '--user=root'
29
30 self.initialize_databases()
31 self.take_db_snapshot()
32@@ -250,7 +249,6 @@
33 # the server-id=0 and no replication thing...
34 , "--server-id=%d" %(self.get_numeric_server_id()+1)
35 , self.secure_file_string
36- , self.user_string
37 ]
38
39 if not self.version.startswith('5.0'):
40
41=== modified file 'lib/server_mgmt/percona.py'
42--- lib/server_mgmt/percona.py 2011-12-23 00:31:12 +0000
43+++ lib/server_mgmt/percona.py 2011-12-29 05:14:23 +0000
44@@ -122,7 +122,6 @@
45 self.secure_file_string = ''
46 else:
47 self.secure_file_string = "--secure-file-priv='%s'" %(self.vardir)
48- self.user_string = '--user=root'
49
50 self.initialize_databases()
51 self.take_db_snapshot()
52@@ -239,7 +238,6 @@
53 , "--default-storage-engine=%s" %(self.default_storage_engine)
54 , "--server-id=%d" %(self.get_numeric_server_id)
55 , self.secure_file_string
56- , self.user_string
57 ]
58
59 if self.gdb:

Subscribers

People subscribed via source and target branches