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

Fix: use ENGINE=innodb instead of type=innodb

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-30 21:43:40 +02:00
parent a429a930d0
commit 2191a4dc73
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
View File

@ -23,4 +23,4 @@ CREATE TABLE llx_osc_categories (
PRIMARY KEY (rowid), PRIMARY KEY (rowid),
UNIQUE KEY dolicatid (dolicatid), UNIQUE KEY dolicatid (dolicatid),
UNIQUE KEY osccatid (osccatid) UNIQUE KEY osccatid (osccatid)
) TYPE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC'; ) ENGINE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';

2
dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
View File

@ -22,4 +22,4 @@ CREATE TABLE llx_osc_customer (
fk_soc int(11) NOT NULL default '0', fk_soc int(11) NOT NULL default '0',
PRIMARY KEY (rowid), PRIMARY KEY (rowid),
UNIQUE KEY fk_soc (fk_soc) UNIQUE KEY fk_soc (fk_soc)
) TYPE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr'; ) ENGINE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';

2
dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
View File

@ -22,4 +22,4 @@ CREATE TABLE llx_osc_order (
fk_commande int(11) NOT NULL default '0', fk_commande int(11) NOT NULL default '0',
PRIMARY KEY (rowid), PRIMARY KEY (rowid),
UNIQUE KEY fk_commande (fk_commande) UNIQUE KEY fk_commande (fk_commande)
) TYPE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr'; ) ENGINE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';

2
dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
View File

@ -22,6 +22,6 @@ CREATE TABLE llx_osc_product (
fk_product int(11) NOT NULL default '0', fk_product int(11) NOT NULL default '0',
PRIMARY KEY (rowid), PRIMARY KEY (rowid),
UNIQUE KEY fk_product (fk_product) UNIQUE KEY fk_product (fk_product)
) TYPE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr'; ) ENGINE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';

2
htdocs/admin/modules.php
View File

@ -111,7 +111,7 @@ foreach ($modulesdir as $dir)
{ {
// Load modules attributes in arrays (name, numero, orders) from dir directory // Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>"; //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); $handle=@opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {

2
htdocs/admin/system/database-tables.php
View File

@ -32,7 +32,7 @@ if (!$user->admin) accessforbidden();
if ($_GET["action"] == 'convert') if ($_GET["action"] == 'convert')
{ {
$db->query("alter table ".$_GET["table"]." type=INNODB"); $db->query("alter table ".$_GET["table"]." ENGINE=INNODB");
} }

2
htdocs/install/etape2.php
View File

@ -188,7 +188,7 @@ if ($action == "set")
fclose($fp); fclose($fp);
$buffer=trim($buffer); $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); $buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
} }