Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim McLaughlin <tim.j.mclaughlin@gmail.com>2017-01-10 05:33:14 +0300
committerTim McLaughlin <tim.j.mclaughlin@gmail.com>2017-01-10 05:33:14 +0300
commit3b07b39c352437bf685b55b9011c565d463b8a34 (patch)
tree568370a9ff33ecd692285128a577116b50dbcd4e /tbl_operations.php
parent95956f011d34b9a11197ba2ef098172cb418f7ba (diff)
Fix PHP Notice 'Undefined index: row_format' when altering table options.
Issue #12840 Signed-off-by: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
Diffstat (limited to 'tbl_operations.php')
-rw-r--r--tbl_operations.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tbl_operations.php b/tbl_operations.php
index 3c3754d7f4..bbddbaf2ff 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -146,13 +146,17 @@ if (isset($_REQUEST['submitoptions'])) {
$new_tbl_storage_engine = '';
}
+ $row_format = (isset($create_options['row_format']))
+ ? $create_options['row_format']
+ : $pma_table->getStatusInfo('ROW_FORMAT');
+
$table_alters = PMA_getTableAltersArray(
$is_myisam_or_aria, $is_isam, $create_options['pack_keys'],
(empty($create_options['checksum']) ? '0' : '1'),
$is_aria,
((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''),
(empty($create_options['delay_key_write']) ? '0' : '1'),
- $is_innodb, $is_pbxt, $create_options['row_format'],
+ $is_innodb, $is_pbxt, $row_format,
$new_tbl_storage_engine,
((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'),
$tbl_collation