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

bug #1040682

Browse Source
This commit is contained in:
Alexander M. Turek
2005-02-03 19:52:46 +00:00
parent a56acf0d61
commit 303c4f5fb1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-02-03 Alexander M. Turek <me@derrabus.de>
* tbl_addfield.php: Bug #1040682 (adding field with collation).
2005-02-02 Marc Delisle <lem9@users.sourceforge.net> 2005-02-02 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean * libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean
to mysqli_num_rows() or mysql_num_row(), it expects a result resource to mysqli_num_rows() or mysql_num_row(), it expects a result resource

6
tbl_addfield.php
View File

@@ -62,8 +62,10 @@ if (isset($submit_num_fields)) {
} }
if ($field_attribute[$i] != '') { if ($field_attribute[$i] != '') {
$query .= ' ' . $field_attribute[$i]; $query .= ' ' . $field_attribute[$i];
} else if (PMA_MYSQL_INT_VERSION >= 40100 && isset($field_charset[$i]) && $field_charset[$i] != '') { } else if (PMA_MYSQL_INT_VERSION >= 40100 && isset($field_collation[$i]) && $field_collation[$i] != '') {
$query .= ' CHARACTER SET ' . $field_charset[$i]; list($tmp_charset) = explode('_', $field_collation[$i]);
$query .= ' CHARACTER SET ' . $tmp_charset . ' COLLATE ' . $field_collation[$i];
unset($tmp_charset);
} }
if ($field_default[$i] != '') { if ($field_default[$i] != '') {
if (strtoupper($field_default[$i]) == 'NULL') { if (strtoupper($field_default[$i]) == 'NULL') {