diff options
| author | Isaac Bennetch <bennetch@gmail.com> | 2017-01-20 06:03:05 +0300 |
|---|---|---|
| committer | Isaac Bennetch <bennetch@gmail.com> | 2017-01-20 06:03:05 +0300 |
| commit | 8bfd77324838649d20212ef61a6aa26d3fab5199 (patch) | |
| tree | 7009685fffb291e381bbf22e3c11b02341ec623b /tbl_operations.php | |
| parent | ac660eacc4105ad5c273badf8b011c99fb4725a1 (diff) | |
| parent | f2cdfc5d00ef9f3780ac0c596062dda2a8930c64 (diff) | |
Merge and fix conflicts from 3b07b39
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Diffstat (limited to 'tbl_operations.php')
| -rw-r--r-- | tbl_operations.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tbl_operations.php b/tbl_operations.php index ebd327d998..d930576d19 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -134,13 +134,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( $pma_table, $create_options['pack_keys'], (empty($create_options['checksum']) ? '0' : '1'), ((isset($create_options['page_checksum'])) ? $create_options['page_checksum'] : ''), (empty($create_options['delay_key_write']) ? '0' : '1'), - $create_options['row_format'], + $row_format, $new_tbl_storage_engine, ((isset($create_options['transactional']) && $create_options['transactional'] == '0') ? '0' : '1'), $tbl_collation |