Merge pull request #8238 from guillaume-uH57J9/patch-1

install, don't use innodb engine for pgsql to fix #8237
This commit is contained in:
Laurent Destailleur 2018-03-02 17:45:12 +01:00 committed by GitHub
commit 5d74d01f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -201,8 +201,10 @@ if ($action == "set")
{
$buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
}
else if ($conf->db->type == 'mssql')
else
{
// Keyword ENGINE is MySQL-specific, so scrub it for
// other database types (mssql, pgsql)
$buffer=preg_replace('/type=innodb/i','',$buffer);
$buffer=preg_replace('/ENGINE=innodb/i','',$buffer);
}