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

bug #1674914 [structure] changing definition of a TIMESTAMP field

Browse Source
This commit is contained in:
Marc Delisle
2007-03-08 18:14:37 +00:00
parent 1eca371e5a
commit be23ee35d1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
- bug #1674914 [structure] changing definition of a TIMESTAMP field
- bug #1615530 [upload] added more specific error message if field upload fails - bug #1615530 [upload] added more specific error message if field upload fails
- [gui] avoid displaying a wide selector in server selection - [gui] avoid displaying a wide selector in server selection
+ [core] added PMA_fatalError() and made use of it + [core] added PMA_fatalError() and made use of it

2
libraries/Table.class.php
View File

@@ -320,7 +320,7 @@ class PMA_Table {
$query .= ' DEFAULT NULL'; $query .= ' DEFAULT NULL';
} else { } else {
if (strlen($default)) { if (strlen($default)) {
if ($is_timestamp) { if ($is_timestamp && $default == '0') {
// a TIMESTAMP does not accept DEFAULT '0' // a TIMESTAMP does not accept DEFAULT '0'
// but DEFAULT 0 works // but DEFAULT 0 works
$query .= ' DEFAULT ' . PMA_sqlAddslashes($default); $query .= ' DEFAULT ' . PMA_sqlAddslashes($default);