Merge pull request #171 from ctrlaltdel/fix-default-storage-engine
[Important] Fix default-storage-engine default value
This commit is contained in:
commit
d8fbc283e0
2 changed files with 3 additions and 1 deletions
|
@ -14,7 +14,7 @@ class mysql::params {
|
||||||
|
|
||||||
$bind_address = '127.0.0.1'
|
$bind_address = '127.0.0.1'
|
||||||
$config_template = 'mysql/my.cnf.erb'
|
$config_template = 'mysql/my.cnf.erb'
|
||||||
$default_engine = undef
|
$default_engine = 'UNSET'
|
||||||
$etc_root_password = false
|
$etc_root_password = false
|
||||||
$manage_service = true
|
$manage_service = true
|
||||||
$old_root_password = ''
|
$old_root_password = ''
|
||||||
|
|
|
@ -163,6 +163,8 @@ describe 'mysql::config' do
|
||||||
]
|
]
|
||||||
if param_values[:default_engine] != 'UNSET'
|
if param_values[:default_engine] != 'UNSET'
|
||||||
expected_lines = expected_lines | [ "default-storage-engine = #{param_values[:default_engine]}" ]
|
expected_lines = expected_lines | [ "default-storage-engine = #{param_values[:default_engine]}" ]
|
||||||
|
else
|
||||||
|
content.should_not match(/^default-storage-engine = /)
|
||||||
end
|
end
|
||||||
if param_values[:ssl]
|
if param_values[:ssl]
|
||||||
expected_lines = expected_lines |
|
expected_lines = expected_lines |
|
||||||
|
|
Loading…
Reference in a new issue