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

avoid adding BINARY and VARBINARY twice in the drop-down list

Browse Source
This commit is contained in:
Marc Delisle
2004-09-03 20:44:57 +00:00
parent 2814c4ce81
commit 9572a3f6bf
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* main.php, server_privileges.php, libraries/common.lib.php: * main.php, server_privileges.php, libraries/common.lib.php:
replace charset introducers by CONVERT USING, replace charset introducers by CONVERT USING,
to support servers where the mysql.* tables are not in latin1 to support servers where the mysql.* tables are not in latin1
* libraries/database_interface.lib.php: do not add BINARY and VARBINARY
twice in the drop-down list of field types
2004-09-02 Alexander M. Turek <me@derrabus.de> 2004-09-02 Alexander M. Turek <me@derrabus.de>
* Documentation.html: Typos; added a note about the deprecated MySQL * Documentation.html: Typos; added a note about the deprecated MySQL

8
libraries/database_interface.lib.php
View File

@@ -157,8 +157,12 @@ function PMA_DBI_postConnect($link) {
$collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link); $collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link);
// Add some field types to the list // Add some field types to the list
$GLOBALS['cfg']['ColumnTypes'][] = 'BINARY'; // (we pass twice here; feel free to code something better :)
$GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY'; if (!defined('PMA_ADDED_FIELD_TYPES')) {
$GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
$GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
define('PMA_ADDED_FIELD_TYPES',1);
}
} else { } else {
require_once('./libraries/charset_conversion.lib.php'); require_once('./libraries/charset_conversion.lib.php');