Index: t3lib/class.t3lib_sqlparser.php =================================================================== --- t3lib/class.t3lib_sqlparser.php (revision 5381) +++ t3lib/class.t3lib_sqlparser.php (working copy) @@ -487,7 +487,7 @@ // Finding what is after the table definition - table type in MySQL if ($delim==')') { - if ($this->nextPart($parseString, '^(TYPE[[:space:]]*=)')) { + if ($this->nextPart($parseString, '^((ENGINE|TYPE)[[:space:]]*=)')) { $result['tableType'] = $parseString; $parseString = ''; } @@ -1741,4 +1741,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_sqlparser.php']); } -?> \ No newline at end of file +?> Index: t3lib/class.t3lib_install.php =================================================================== --- t3lib/class.t3lib_install.php (revision 5381) +++ t3lib/class.t3lib_install.php (working copy) @@ -460,9 +460,14 @@ function getCollationForCharset($charset) { // Load character sets, if not cached already if (!count($this->character_sets)) { - $this->character_sets = $GLOBALS['TYPO3_DB']->admin_get_charsets(); + if (method_exists($GLOBALS['TYPO3_DB'],'admin_get_charsets')) { + $this->character_sets = $GLOBALS['TYPO3_DB']->admin_get_charsets(); + } else { + $this->character_sets[$charset] = array(); // Add empty element to avoid that the check will be repeated + } } + $collation = ''; if (isset($this->character_sets[$charset]['Default collation'])) { $collation = $this->character_sets[$charset]['Default collation']; } Index: typo3/sysext/dbal/class.ux_t3lib_db.php =================================================================== --- typo3/sysext/dbal/class.ux_t3lib_db.php (revision 5381) +++ typo3/sysext/dbal/class.ux_t3lib_db.php (working copy) @@ -1949,6 +1949,15 @@ } /** + * mysql() wrapper function, used by the Install Tool. + * + * @return array + */ + function admin_get_charsets() { + return array(); + } + + /** * mysql() wrapper function, used by the Install Tool and EM for all queries regarding management of the database! * * @param string Query to execute @@ -2671,4 +2680,4 @@ include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']); } -?> \ No newline at end of file +?>