Merge branch 'stable-3.1' into 'stable-3.1'

Fix #4061 clarified sql-check during install / updates



See merge request !513

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -229,7 +229,7 @@ public function configure_database() {
 		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

@@ -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();
 	}