lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Works with mysql 5.5

Browse Source
This commit is contained in:
Laurent Destailleur 2011-01-16 01:14:34 +00:00
parent 9d5affe984
commit 91d710f8db
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -85,6 +85,7 @@ For developers:
- New: Enhance a lot of internal function to build external modules - New: Enhance a lot of internal function to build external modules
more easily. more easily.
- New: Local user timezone is saved into session (not used yet). - New: Local user timezone is saved into session (not used yet).
- New: Works with Mysql 5.5.
- Qual: Menu system code is simpler. - Qual: Menu system code is simpler.
- Qual: Mutualize some duplicate code. - Qual: Mutualize some duplicate code.
- Qual: Renamed some fields into database to be more internationnal. - Qual: Renamed some fields into database to be more internationnal.

6
htdocs/install/etape2.php
View File

@ -143,6 +143,7 @@ if ($_POST["action"] == "set")
{ {
// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
$dir = "mysql/tables/"; $dir = "mysql/tables/";
$versionmysql550=explode('.','5.5.0');
$ok = 0; $ok = 0;
$handle=opendir($dir); $handle=opendir($dir);
@ -183,6 +184,11 @@ if ($_POST["action"] == "set")
fclose($fp); fclose($fp);
$buffer=trim($buffer); $buffer=trim($buffer);
// For Mysql 5.5+, we must removed type=innodb
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
if (sizeof($versionarray) && versioncompare($versionarray,$versionmysql550) >= 0) $buffer=preg_replace('/type=innodb/i','',$buffer);
}
//print "<tr><td>Creation de la table $name/td>"; //print "<tr><td>Creation de la table $name/td>";
$requestnb++; $requestnb++;