diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-22 13:07:04 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-07-22 13:07:04 +0400 |
| commit | 3586bb992f0e6c325207dc55bd01c1f3607f0b31 (patch) | |
| tree | 8152d54c4ae7e92c342bf1f5e2126fee22ecdbdb /tbl_printview.php | |
| parent | 74a00a110f6d15d24b5b40c02ec8a3916a6acd15 (diff) | |
| parent | d8f6e7da389da4ff99435dea358b713af116f9e1 (diff) | |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
db_structure.php
libraries/database_interface.lib.php
libraries/server_synchronize.lib.php
server_status.php
sql.php
Diffstat (limited to 'tbl_printview.php')
| -rw-r--r-- | tbl_printview.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tbl_printview.php b/tbl_printview.php index 9ade6035bf..0c237ab97b 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -277,7 +277,7 @@ foreach ($the_tables as $key => $table) { if ($nonisam == false) { // Gets some sizes - $mergetable = PMA_Table::isMerge($db, $table); + $mergetable = PMA_Table::isMerge($db, $table); list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { |