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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-09-04 13:52:30 +02:00
commit 3b2e2164b4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db_datadict.php
View File

@ -207,10 +207,11 @@ foreach ($tables as $table) {
}
$column_name = $row['Field'];
$tmp_column = $analyzed_sql[0]['create_table_fields'][$column_name];
if (PMA_MYSQL_INT_VERSION < 50025
&& ! empty($analyzed_sql[0]['create_table_fields'][$column_name]['type'])
&& $analyzed_sql[0]['create_table_fields'][$column_name]['type'] == 'TIMESTAMP'
&& $analyzed_sql[0]['create_table_fields'][$column_name]['timestamp_not_null']
&& ! empty($tmp_column['type'])
&& $tmp_column['type'] == 'TIMESTAMP'
&& $tmp_column['timestamp_not_null']
) {
// here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as
// having the NULL attribute, but SHOW CREATE TABLE says the