Merged in paulis/processmaker/PM-2884 (pull request #2311)

PM-2884: I solved a issue with ENGINE=InnoDB
This commit is contained in:
Julio Cesar Laura Avendaño
2015-06-08 12:57:57 -04:00

View File

@@ -1358,7 +1358,7 @@ class workspaceTools
if ( !$flag && !is_null($flagFunction) ) {
//Replace TYPE by ENGINE
$script = file_get_contents($filename);
$script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
$script = preg_replace('/\)TYPE\=InnoDB|\)\sTYPE\=InnoDB/', ')ENGINE=InnoDB DEFAULT CHARSET=utf8', $script);
file_put_contents($filename,$script);
$aHost = explode(':',$parameters['dbHost']);
$dbHost = $aHost[0];
@@ -1389,7 +1389,7 @@ class workspaceTools
$script = file_get_contents($filename);
//Replace TYPE by ENGINE
$script = preg_replace('/\)TYPE\=|\)\sTYPE\=/', ')ENGINE=', $script);
$script = preg_replace('/\)TYPE\=InnoDB|\)\sTYPE\=InnoDB/', ')ENGINE=InnoDB DEFAULT CHARSET=utf8', $script);
$lines = explode("\n", $script);
$previous = null;
$insert = false;