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

- added PMA_DBI_get_default_engine()

Browse Source 
- display default engine in table list footer
This commit is contained in:
Sebastian Mendel
2005-11-09 10:06:38 +00:00
parent 714c4c76d4
commit 713f2d4836
3 changed files with 97 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -8,7 +8,10 @@ $Source$
2005-11-09 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-09 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* server_databases.php, mysql_charsets-lib.php: * server_databases.php, mysql_charsets-lib.php:
bug #1351743 undefined function: pma_getservercollation() bug #1351743 undefined function: pma_getservercollation()
* db_details_structure.php: fixed display issues * database_interface.lib.php: added PMA_DBI_get_default_engine()
* db_details_structure.php:
- fixed display issues
- display default engine in footer
2005-11-08 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-11-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* Documentation.html, browse_foreigners.php, error.php, * Documentation.html, browse_foreigners.php, error.php,

11
db_details_structure.php
View File

@@ -366,18 +366,17 @@ if ($cfg['ShowStats']) {
<?php echo sprintf( $strTables, PMA_formatNumber( $num_tables, 0 ) ); ?> <?php echo sprintf( $strTables, PMA_formatNumber( $num_tables, 0 ) ); ?>
</th> </th>
<th colspan="<?php echo ( $db_is_information_schema ? 3 : 6 ) ?>" align="center"> <th colspan="<?php echo ( $db_is_information_schema ? 3 : 6 ) ?>" align="center">
<?php echo $strSum; ?> <?php echo $strSum; ?></th>
</th>
<th class="value"><?php echo PMA_formatNumber( $sum_entries, 0 ); ?></th> <th class="value"><?php echo PMA_formatNumber( $sum_entries, 0 ); ?></th>
<?php <?php
if (!($cfg['PropertiesNumColumns'] > 1)) { if (!($cfg['PropertiesNumColumns'] > 1)) {
echo ' <th align="center">--</th>' . "\n"; echo ' <th align="center">'
.PMA_DBI_get_default_engine() . '</th>' . "\n";
if ( ! empty( $db_collation ) ) { if ( ! empty( $db_collation ) ) {
echo ' <th align="center">' . "\n" echo ' <th align="center">' . "\n"
. ' <dfn title="' . ' <dfn title="'
. PMA_getCollationDescr($db_collation) . '">' . $db_collation . PMA_getCollationDescr($db_collation) . '">' . $db_collation
. '</dfn>' . "\n" . '</dfn></th>';
. ' </th>' . "\n";
} }
} }
@@ -415,7 +414,7 @@ $checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db);
<img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" <img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>"
width="38" height="1" alt="" /> width="38" height="1" alt="" />
<select name="submit_mult" dir="ltr" onchange="this.form.submit();"> <select name="submit_mult" onchange="this.form.submit();">
<?php <?php
echo ' <option value="' . $strWithChecked . '" selected="selected">' echo ' <option value="' . $strWithChecked . '" selected="selected">'
. $strWithChecked . '</option>' . "\n"; . $strWithChecked . '</option>' . "\n";

13
libraries/database_interface.lib.php
View File

@@ -734,4 +734,17 @@ function PMA_DBI_fetch_result( $result, $key = NULL, $value = NULL, $link = NULL
PMA_DBI_free_result( $result ); PMA_DBI_free_result( $result );
return $resultrows; return $resultrows;
} }
/**
* return default able engine for gicen database
*
* @return string default table engine
*/
function PMA_DBI_get_default_engine() {
if ( PMA_MYSQL_INT_VERSION > 50002 ) {
return PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE \'storage_engine\';', 0, 1 );
} else {
return PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE \'table_type\';', 0, 1 );
}
}
?> ?>