Merge branch 'sql_mode' into 'master'

SQL mode fixed (install.php and update.php)

This should simplify https://www.howtoforge.com/the-perfect-server-opensuse-13.1-with-apache2-mysql-php-postfix-and-ispconfig-3-p4 **step 8** and fix !480

See merge request !517

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -224,14 +224,8 @@ public function reconfigure_app($service, $reconfigure_services_answer) {
 	public function configure_database() {
 		global $conf;
 
-		//* check sql-mode
-		$check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode");
-		if ($check_sql_mode['@@sql_mode'] != '' && strpos($check_sql_mode['@@sql_mode'],'NO_ENGINE_SUBSTITUTION')===false) {
-			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 on the server\n";
-			die();
-		}
+		//* ensure no modes with errors for ENGINE=MyISAM
+		$this->db->query("SET sql_mode = ''");
 
 		//** Create the database
 		if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) {

install/lib/update.lib.php

@@ -123,14 +123,8 @@ function checkDbHealth() {
 function updateDbAndIni() {
 	global $inst, $conf;
 
-	//* check sql-mode
-	$check_sql_mode = $inst->db->queryOneRecord("SELECT @@sql_mode");
-	if ($check_sql_mode['@@sql_mode'] != '' && strpos($check_sql_mode['@@sql_mode'],'NO_ENGINE_SUBSTITUTION')===false) {
-		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 on the server\n";
-		die();
-	}
+	//* ensure no modes with errors for ENGINE=MyISAM
+	$this->db->query("SET sql_mode = ''");
 
 	//* Update $conf array with values from the server.ini that shall be preserved
 	$tmp = $inst->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);