diff --git a/ChangeLog b/ChangeLog index 2d6e3e6eb..00a8fe33d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-10-16 Marc Delisle + * tbl_create.php: undefined $field_collation under MySQL < 4.1.x + 2005-10-14 Marc Delisle * libraries/dbi/mysqli.dbi.lib.php: problem under MySQL 4.0.x * libraries/sql_query_form.lib.php: support MySQL < 4.1.x @@ -24,7 +27,7 @@ $Source$ * libraries/import.lib.php: uninitialized variables 2005-10-13 Marc Delisle - * tbl_addfield.php: undefined $field_collation under MySQL 4.0.x + * tbl_addfield.php: undefined $field_collation under MySQL < 4.1.x 2005-10-13 Michal Čihař * Documentation.html: Fix URL rewriting not to match empty parts. diff --git a/tbl_create.php b/tbl_create.php index 43ef5946a..116cace53 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -63,7 +63,7 @@ if (isset($submit_num_fields)) { continue; } - $query = PMA_generateFieldSpec($field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], $field_collation[$i], $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], isset($field_comments[$i]) ? $field_comments[$i] : '', $field_primary, $i); + $query = PMA_generateFieldSpec($field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], isset($field_collation[$i]) ? $field_collation[$i] : '', $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], isset($field_comments[$i]) ? $field_comments[$i] : '', $field_primary, $i); $query .= ', '; $sql_query .= $query;