Merge remote-tracking branch 'origin/QA_3_5'
Conflicts: tbl_printview.php tbl_structure.php
This commit is contained in:
commit
539465aa3d
@ -299,10 +299,6 @@ foreach ($the_tables as $key => $table) {
|
||||
<td class="vtop">
|
||||
<big><?php echo __('Space usage') . ':'; ?></big>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<th><?php echo __('Type'); ?></th>
|
||||
<th colspan="2" class="center"><?php echo __('Usage'); ?></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding-right: 10px"><?php echo __('Data'); ?></td>
|
||||
<td class="right"><?php echo $data_size; ?></td>
|
||||
@ -355,10 +351,6 @@ foreach ($the_tables as $key => $table) {
|
||||
<td class="vtop">
|
||||
<big><?php echo __('Row Statistics') . ':'; ?></big>
|
||||
<table width="100%">
|
||||
<tr>
|
||||
<th><?php echo __('Statements'); ?></th>
|
||||
<th class="center"><?php echo __('Value'); ?></th>
|
||||
</tr>
|
||||
<?php
|
||||
if (isset($showtable['Row_format'])) {
|
||||
?>
|
||||
|
||||
@ -828,12 +828,6 @@ if ($cfg['ShowStats']) {
|
||||
<?php if (! $tbl_is_view && ! $db_is_information_schema) { ?>
|
||||
<table id="tablespaceusage" class="data">
|
||||
<caption class="tblHeaders"><?php echo __('Space usage'); ?></caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th><?php echo __('Type'); ?></th>
|
||||
<th colspan="2"><?php echo __('Usage'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="<?php echo ($odd_row = !$odd_row) ? 'odd' : 'even'; ?>">
|
||||
<th class="name"><?php echo __('Data'); ?></th>
|
||||
@ -894,12 +888,6 @@ if ($cfg['ShowStats']) {
|
||||
?>
|
||||
<table id="tablerowstats" class="data">
|
||||
<caption class="tblHeaders"><?php echo __('Row Statistics'); ?></caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th><?php echo __('Statements'); ?></th>
|
||||
<th><?php echo __('Value'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
if (isset($showtable['Row_format'])) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user