Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
slapos
Commits
73b5e348
Commit
73b5e348
authored
Aug 30, 2012
by
Alain Takoudjou
Committed by
Cédric de Saint Martin
Aug 31, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve mariadb current work dir bug
(cherry picked from commit
fea3a2e2
)
parent
b7ab8b3f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/__init__.py
+1
-0
slapos/recipe/mysql/mysql.py
slapos/recipe/mysql/mysql.py
+1
-1
No files found.
slapos/recipe/mysql/__init__.py
View file @
73b5e348
...
@@ -107,6 +107,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -107,6 +107,7 @@ class Recipe(GenericBaseRecipe):
mysql_binary
=
mysql_binary
,
mysql_binary
=
mysql_binary
,
socket
=
socket
,
socket
=
socket
,
configuration_file
=
mysql_conf_file
,
configuration_file
=
mysql_conf_file
,
cwd
=
self
.
options
[
'mysql-base-directory'
],
)
)
)
)
path_list
.
append
(
mysqld
)
path_list
.
append
(
mysqld
)
...
...
slapos/recipe/mysql/mysql.py
View file @
73b5e348
...
@@ -17,7 +17,7 @@ def runMysql(conf):
...
@@ -17,7 +17,7 @@ def runMysql(conf):
popen
=
subprocess
.
Popen
([
conf
[
'mysql_install_binary'
],
popen
=
subprocess
.
Popen
([
conf
[
'mysql_install_binary'
],
'--skip-name-resolve'
,
'--skip-host-cache'
,
'--no-defaults'
,
'--skip-name-resolve'
,
'--skip-host-cache'
,
'--no-defaults'
,
'--datadir=%s'
%
conf
[
'data_directory'
]],
'--datadir=%s'
%
conf
[
'data_directory'
]],
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
STDOUT
)
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
STDOUT
,
cwd
=
conf
[
'cwd'
]
)
result
=
popen
.
communicate
()[
0
]
result
=
popen
.
communicate
()[
0
]
if
popen
.
returncode
is
None
or
popen
.
returncode
!=
0
:
if
popen
.
returncode
is
None
or
popen
.
returncode
!=
0
:
print
"Failed to initialise server.
\
n
The error was: %s"
%
result
print
"Failed to initialise server.
\
n
The error was: %s"
%
result
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment