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

Merge branch 'master' of github.com:thilinaa/phpmyadmin

Browse Source
This commit is contained in:
Thilina Buddika 2012-08-04 04:46:14 +05:30
commit 10abc6636a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/operations.lib.php
View File

@ -686,7 +686,7 @@ function PMA_getHtmlForMoveTable()
* @return string $html_output
*/
function PMA_getTableOptionDiv($comment, $tbl_collation, $tbl_storage_engine,
$is_myisam_or_aria, $is_isam, $pack_keys, $delay_key_write, $auto_increment,
$is_myisam_or_aria, $is_isam, $pack_keys, $auto_increment, $delay_key_write,
$transactional, $page_checksum, $is_innodb, $is_pbxt, $is_aria
) {
$html_output = '<div class="operations_half_width clearfloat">';

11
tbl_operations.php
View File

@ -307,9 +307,14 @@ if (strstr($show_comment, '; InnoDB free') === false) {
// in >5.0.4, >4.1.12 and >4.0.11, so I decided not to
// check for version
echo PMA_getTableOptionDiv($comment, $tbl_collation, $tbl_storage_engine,
$is_myisam_or_aria, $is_isam, $pack_keys, $delay_key_write, $auto_increment,
$transactional, $page_checksum, $is_innodb, $is_pbxt, $is_aria
echo PMA_getTableOptionDiv(
$comment, $tbl_collation, $tbl_storage_engine,
$is_myisam_or_aria, $is_isam, $pack_keys,
$auto_increment,
(empty($delay_key_write) ? '0' : '1'),
((isset($transactional) && $transactional == '0') ? '0' : '1'),
((isset($page_checksum)) ? $page_checksum : ''),
$is_innodb, $is_pbxt, $is_aria
);
/**