Do not add BINARY types multiple times (bug #1374457).

This commit is contained in:
Michal Čihař
2005-12-06 14:10:37 +00:00
parent 723d393b54
commit a49827a084
2 changed files with 4 additions and 4 deletions

View File

@@ -572,12 +572,10 @@ function PMA_DBI_postConnect($link, $is_controluser = FALSE) {
$charset_connection = PMA_DBI_get_variable('character_set_connection', PMA_DBI_GETVAR_SESSION, $link);
}
// Add some field types to the list
// (we pass twice here; feel free to code something better :)
if (!defined('PMA_ADDED_FIELD_TYPES')) {
// Add some field types to the list, this needs to be done once per session!
if ($GLOBALS['cfg']['ColumnTypes'][count($GLOBALS['cfg']['ColumnTypes']) - 1] != 'VARBINARY') {
$GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
$GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
define('PMA_ADDED_FIELD_TYPES',1);
}
} else {