Commit 9fff23bf authored by Karsten Dambekalns's avatar Karsten Dambekalns
Browse files

Applied patch to fix bug #987 (hardcoded MyISAM table type.


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_3-8@729 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 1f21bdb6
2005-05-19 Karsten Dambekalns <karsten@typo3.org>
* t3lib/class.t3lib_install.php: Fix for bug #987 (hardcoded MyISAM table type)
2005-05-19 Michael Stucki <michael@typo3.org>
* Small fix in typo3/sysext/install/mod/class.tx_install.php: GraphicsMagick executed without any parameters caused a server error (used in the Install Tool for guessing the product version)
......
......@@ -286,6 +286,8 @@ class t3lib_install {
}
} else {
if (substr($value,0,1)==')' && substr($value,-1)==';') {
preg_match('/(ENGINE|TYPE)=([a-zA-Z]*)/',$value,$ttype);
$total[$isTable]['extra']['ttype'] = $ttype[2];
$isTable = '';
} else {
$lineV = ereg_replace(',$','',$value);
......@@ -293,7 +295,7 @@ class t3lib_install {
// Make sure there is no default value when auto_increment is set
if(stristr($parts[1],'auto_increment')) {
$parts[1] = eregi_replace(' default \'0\'','',$parts[1]);
$parts[1] = preg_replace('/ default \'0\'/i','',$parts[1]);
}
// "default" is always lower-case
if(strstr($parts[1], ' DEFAULT ')) {
......@@ -542,7 +544,8 @@ class t3lib_install {
list($count) = $GLOBALS['TYPO3_DB']->sql_fetch_row($res);
$statements['tables_count'][md5($statement)] = $count?'Records in table: '.$count:'';
} else {
$statement = 'CREATE TABLE '.$table." (\n".implode(",\n",$whole_table)."\n) TYPE=MyISAM;";
$statement = 'CREATE TABLE '.$table." (\n".implode(",\n",$whole_table)."\n)";
$statement .= ($info['extra']['ttype']) ? ' TYPE='.$info['extra']['ttype'].';' : ';';
$statements['create_table'][md5($statement)]=$statement;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment