nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2979234 [import] Create tables with current charset and collation.

Browse Source
This commit is contained in:
Nate
2010-03-31 14:23:50 +02:00
committed by Michal Čihař
parent fad777ecb2
commit 428ed49d17
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Kaarel Nummert - kaarelnu thanks to Kaarel Nummert - kaarelnu
- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_
- patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut - 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) 3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly

2
libraries/import.lib.php
View File

@@ -947,7 +947,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
$tempSQLStr .= ", "; $tempSQLStr .= ", ";
} }
} }
$tempSQLStr .= ") ENGINE=MyISAM;"; $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";";
/** /**
* Each SQL statement is executed immediately * Each SQL statement is executed immediately