Merge branch 'master' into 'stable-3.1'

Till Brehm · Till Brehm · commit 498c86fbbfc4 · 2016-05-26T18:17:26.000+02:00
Master



See merge request !348
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -224,7 +224,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 /etc/mysql/my.cnf and restart mysqld afterwards\n";
+			echo"to the mysqld-section in your mysql-config and restart mysqld afterwards\n";
 			die();
 		}
 
diff --git a/install/lib/update.lib.php b/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 /etc/mysql/my.cnf and restart mysqld afterwards\n";
+		echo"to the mysqld-section in your mysql-config and restart mysqld afterwards\n";
 		die();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public function configure_database() {`
`224`	`224`	`if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') {`
`225`	`225`	`echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n";`
`226`	`226`	`echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n";`
`227`		`- echo"to the mysqld-section in /etc/mysql/my.cnf and restart mysqld afterwards\n";`
	`227`	`+ echo"to the mysqld-section in your mysql-config and restart mysqld afterwards\n";`
`228`	`228`	`die();`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ function updateDbAndIni() {`
`128`	`128`	`if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') {`
`129`	`129`	`echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n";`
`130`	`130`	`echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n";`
`131`		`- echo"to the mysqld-section in /etc/mysql/my.cnf and restart mysqld afterwards\n";`
	`131`	`+ echo"to the mysqld-section in your mysql-config and restart mysqld afterwards\n";`
`132`	`132`	`die();`
`133`	`133`	`}`
`134`	`134`