From 8b6facdf39fadc2d58f932cab3dbad367d30a527 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Tue, 11 Oct 2005 13:57:47 +0000 Subject: [PATCH] no table statistics for information_schema --- ChangeLog | 4 +- tbl_printview.php | 495 ++++++++++++++++++----------------- tbl_properties_structure.php | 7 +- 3 files changed, 258 insertions(+), 248 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06f80e6df..4bc521d47 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ ----------------------- +---------------------- phpMyAdmin - Changelog ---------------------- @@ -15,6 +15,8 @@ $Source$ themes/darkblue_orange/css/theme_left.css.php themes/original/css/theme_left.css.php: XHTML 1.0 trans. compliance and more semantic XHTML output + * tbl_printview.php, tbl_properties_structure.php: + no table statistics for information_schema 2005-10-09 Marc Delisle * tbl_properties_links.php: invalid js confirmation and operation feedback diff --git a/tbl_printview.php b/tbl_printview.php index 0b5da38a0..8da5501ab 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -260,266 +260,271 @@ foreach ($the_tables AS $key => $table) { 0) { - echo "\n"; - ?> -

- - - - - - - - - -
- 0) { - list($free_size, $free_unit) = PMA_formatByteDown($showtable['Data_free']); - list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']); - } else { - unset($free_size); - unset($free_unit); - list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']); - } - list($tot_size, $tot_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']); - if ($num_rows > 0) { - list($avg_size, $avg_unit) = PMA_formatByteDown(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1); - } - - // Displays them - ?> -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0) { echo "\n"; ?> -
-
  -   - +

+ + +   +
- - + + + + - - -
- +
+ 0) { + list($free_size, $free_unit) = PMA_formatByteDown($showtable['Data_free']); + list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']); } else { - echo $showtable['Row_format']; + unset($free_size); + unset($free_unit); + list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']); + } + list($tot_size, $tot_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']); + if ($num_rows > 0) { + list($avg_size, $avg_unit) = PMA_formatByteDown(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1); + } + + // Displays them + ?> +

+ + + + + + + + + + + + +
+   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - +
+
  +   + + + + + + + + + + + + + + + 0) { + $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); + echo "\n"; + ?> + + + + + 0 && $mergetable == FALSE) { + $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); + echo "\n"; + ?> + + + + + + + + + + - - - - - 0) { - $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); + + if (isset($showtable['Create_time'])) { + $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); + echo "\n"; + ?> + + + + + + + + + + + + + + + - - - - +
+ +
+ +
 ø + +
 ø + +
 Autoindex + +
- -
+ +
+ +
+ +
 ø - -
+
+ 0 && $mergetable == FALSE) { - $bgcolor = ((++$i%2) ? $cfg['BgcolorTwo'] : $cfg['BgcolorOne']); - echo "\n"; - ?> -
 ø - -
 Autoindex - -
- -
- -
- -
- - - - - 20) { } // end if ($fields_cnt > 20) echo "\n\n"; - -if (!$tbl_is_view) { +// show table statistics only if +// this is not a view and not the information_schema (MySQL >= 5.00.02) +if ( ! $tbl_is_view + && ( $db != 'information_schema' + || PMA_MYSQL_INT_VERSION < 50002 ) ) { /** * Displays indexes */