Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
218973bb
Commit
218973bb
authored
Jan 30, 2017
by
Till Brehm
Browse files
Merge branch 'stable-3.1' into 'stable-3.1'
Fix
#4061
clarified sql-check during install / updates See merge request
!513
parents
45c429e4
f0b1c622
Changes
2
Hide whitespace changes
Inline
Side-by-side
install/lib/installer_base.lib.php
View file @
218973bb
...
...
@@ -229,7 +229,7 @@ class installer_base {
if
(
$check_sql_mode
[
'@@sql_mode'
]
!=
''
&&
$check_sql_mode
[
'@@sql_mode'
]
!=
'NO_ENGINE_SUBSTITUTION'
)
{
echo
"Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add
\n\n
"
;
echo
" sql-mode=
\"
NO_ENGINE_SUBSTITUTION
\"\n\n
"
;
echo
"to the mysqld-section in your mysql-config and restart mysqld afterwards
\n
"
;
echo
"to the mysqld-section in your mysql-config
on this server
and restart mysqld afterwards
\n
"
;
die
();
}
...
...
install/lib/update.lib.php
View file @
218973bb
...
...
@@ -128,7 +128,7 @@ function updateDbAndIni() {
if
(
$check_sql_mode
[
'@@sql_mode'
]
!=
''
&&
$check_sql_mode
[
'@@sql_mode'
]
!=
'NO_ENGINE_SUBSTITUTION'
)
{
echo
"Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add
\n\n
"
;
echo
" sql-mode=
\"
NO_ENGINE_SUBSTITUTION
\"\n\n
"
;
echo
"to the mysqld-section in your mysql-config and restart mysqld afterwards
\n
"
;
echo
"to the mysqld-section in your mysql-config
on this server
and restart mysqld afterwards
\n
"
;
die
();
}
...
...
Write
Preview
Supports
Markdown
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