From 2191a4dc73362c37b6c7fad32780d96526c62133 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Jul 2012 21:43:40 +0200
Subject: [PATCH] Fix: use ENGINE=innodb instead of type=innodb
---
dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql | 2 +-
dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql | 2 +-
dev/dbmodel/emulate_oscommerce/llx_osc_order.sql | 2 +-
dev/dbmodel/emulate_oscommerce/llx_osc_product.sql | 2 +-
htdocs/admin/modules.php | 2 +-
htdocs/admin/system/database-tables.php | 2 +-
htdocs/install/etape2.php | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
index 84bfd1e6558..23a96cc996b 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
@@ -23,4 +23,4 @@ CREATE TABLE llx_osc_categories (
PRIMARY KEY (rowid),
UNIQUE KEY dolicatid (dolicatid),
UNIQUE KEY osccatid (osccatid)
-) TYPE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';
+) ENGINE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
index 1d3a65615ee..3f878e97ff5 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
@@ -22,4 +22,4 @@ CREATE TABLE llx_osc_customer (
fk_soc int(11) NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_soc (fk_soc)
-) TYPE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';
+) ENGINE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
index 8927849df6c..a2cb1ad8146 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
@@ -22,4 +22,4 @@ CREATE TABLE llx_osc_order (
fk_commande int(11) NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_commande (fk_commande)
-) TYPE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';
+) ENGINE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
index 9b7e463aa19..dba9ca1fef1 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
@@ -22,6 +22,6 @@ CREATE TABLE llx_osc_product (
fk_product int(11) NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_product (fk_product)
-) TYPE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';
+) ENGINE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 8c39f3a8fe7..5db40f5cdbd 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -111,7 +111,7 @@ foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
- dol_syslog("Scan directory ".$dir." for modules");
+ dol_syslog("Scan directory ".$dir." for module descriptor files (modXXX.class.php)");
$handle=@opendir($dir);
if (is_resource($handle))
{
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index b634d98e6b7..abba79fc5cc 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -32,7 +32,7 @@ if (!$user->admin) accessforbidden();
if ($_GET["action"] == 'convert')
{
- $db->query("alter table ".$_GET["table"]." type=INNODB");
+ $db->query("alter table ".$_GET["table"]." ENGINE=INNODB");
}
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index b8373847c25..a8904cd10ab 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -188,7 +188,7 @@ if ($action == "set")
fclose($fp);
$buffer=trim($buffer);
- if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') // For Mysql 5.5+, we must replace type=innodb
+ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') // For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
{
$buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
}
--
GitLab