Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/db/DbPDO.php

@@ -209,13 +209,27 @@ class DbPDOCore extends Db
 
 		if (strtolower($engine) == 'innodb')
 		{
+			$value = 0;
+			
 			$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
 			$result = $link->query($sql);
 			if (!$result)
-				return 4;
+				$value = 4;
 			$row = $result->fetch();
 			if (!$row || strtolower($row['Value']) != 'yes')
-				return 4;
+				$value = 4;
+			
+			/* MySQL >= 5.6 */
+			$sql = 'SHOW ENGINES';
+			$result = $link->query($sql);
+			while ($row = $result->fetch())
+				if ($row['Engine'] == 'InnoDB')
+				{
+					if (in_array($row['Support'], array('DEFAULT', 'YES')))
+						$value = 0;
+					break;
+				}
+			return $value;
 		}
 		unset($link);
 		return 0;

classes/db/MySQL.php

@@ -168,13 +168,27 @@ class MySQLCore extends Db
 
 		if (strtolower($engine) == 'innodb')
 		{
+			$value = 0;
+			
 			$sql = 'SHOW VARIABLES WHERE Variable_name = \'have_innodb\'';
 			$result = mysql_query($sql);
 			if (!$result)
-				return 4;
+				$value = 4;
 			$row = mysql_fetch_assoc($result);
 			if (!$row || strtolower($row['Value']) != 'yes')
-				return 4;
+				$value = 4;
+			
+			/* MySQL >= 5.6 */
+			$sql = 'SHOW ENGINES';
+			$result = mysql_query($sql);
+			while ($row = mysql_fetch_assoc($result))
+				if ($row['Engine'] == 'InnoDB')
+				{
+					if (in_array($row['Support'], array('DEFAULT', 'YES')))
+						$value = 0;
+					break;
+				}
+			return $value;
 		}
 		@mysql_close($link);
 		return 0;