diff --git a/ChangeLog b/ChangeLog index cf576c2b6..1b2f475d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Kaarel Nummert - kaarelnu - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut +- patch #2979234 [import] Create tables with current charset and collation. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/import.lib.php b/libraries/import.lib.php index ca2ac2c55..2f50c5dc3 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -947,7 +947,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tempSQLStr .= ", "; } } - $tempSQLStr .= ") ENGINE=MyISAM;"; + $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";"; /** * Each SQL statement is executed immediately