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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2005-12-06 Michal Čihař <michal@cihar.com> 2005-12-06 Michal Čihař <michal@cihar.com>
* libraries/config.default.php: Modify default export configuration (RFE * libraries/config.default.php: Modify default export configuration (RFE
#1373891). #1373891).
* libraries/database_interface.lib.php: Do not add BINARY types multiple
times (bug #1374457).
2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: wrong quote * libraries/common.lib.php: wrong quote

6
libraries/database_interface.lib.php
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); $charset_connection = PMA_DBI_get_variable('character_set_connection', PMA_DBI_GETVAR_SESSION, $link);
} }
// Add some field types to the list // Add some field types to the list, this needs to be done once per session!
// (we pass twice here; feel free to code something better :) if ($GLOBALS['cfg']['ColumnTypes'][count($GLOBALS['cfg']['ColumnTypes']) - 1] != 'VARBINARY') {
if (!defined('PMA_ADDED_FIELD_TYPES')) {
$GLOBALS['cfg']['ColumnTypes'][] = 'BINARY'; $GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
$GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY'; $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
define('PMA_ADDED_FIELD_TYPES',1);
} }
} else { } else {