← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phpmyadmin/trusty

« back to all changes in this revision

Viewing changes to libraries/structure.lib.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2013-10-07 20:18:01 UTC
  • mfrom: (1.2.46)
  • Revision ID: package-import@ubuntu.com-20131007201801-l5l0ril5992p8sxz
Tags: 4:4.0.8-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/structure.lib.php
1131
1131
 */
1132
1132
function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size)
1133
1133
{
 
1134
    $formatted_size = $unit = '';
 
1135
 
1134
1136
    if (($current_table['ENGINE'] == 'InnoDB'
1135
1137
        && $current_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount'])
1136
1138
        || !isset($current_table['TABLE_ROWS'])
2458
2460
            unset($data['Extra']);
2459
2461
        }
2460
2462
        $current_timestamp = false;
2461
 
        if ($data['Type'] == 'timestamp' && $data['Default'] == 'CURRENT_TIMESTAMP') {
 
2463
        if (($data['Type'] == 'timestamp' || $data['Type'] == 'datetime')
 
2464
            && $data['Default'] == 'CURRENT_TIMESTAMP'
 
2465
        ) {
2462
2466
            $current_timestamp = true;
2463
2467
        }
2464
2468
        $default_type
2466
2470
                ? 'NULL'
2467
2471
                : ($current_timestamp
2468
2472
                    ? 'CURRENT_TIMESTAMP'
2469
 
                    : ($data['Default'] == ''
 
2473
                    : ($data['Default'] === null
2470
2474
                        ? 'NONE'
2471
2475
                        : 'USER_DEFINED'));
2472
2476