Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
91d710f8
Commit
91d710f8
authored
14 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Works with mysql 5.5
parent
9d5affe9
Branches
460-onboard-husker-fmx-metadata
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/install/etape2.php
+6
-0
6 additions, 0 deletions
htdocs/install/etape2.php
with
7 additions
and
0 deletions
ChangeLog
+
1
−
0
View file @
91d710f8
...
@@ -85,6 +85,7 @@ For developers:
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
htdocs/install/etape2.php
+
6
−
0
View file @
91d710f8
...
@@ -143,6 +143,7 @@ if ($_POST["action"] == "set")
...
@@ -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")
...
@@ -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
++
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment