From 2d4b9e2aea9eb6f3914bbfdd574fd13bac424e24 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Oct 2010 06:35:06 -0400 Subject: [PATCH] support ARIA storage engine as well as its previous name MARIA --- ChangeLog | 1 + tbl_operations.php | 55 +++++++++++++++++++++++++++++------------------------- tbl_structure.php | 6 +++--- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9520b72f2..2385125125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3056023 [import] USE query not working - bug #3038193 [display] Error when editing row with GEOMETRY column - bug #3062454 [interface] Display routines/events also when no tables are defined +- support ARIA storage engine as well as its previous name MARIA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/tbl_operations.php b/tbl_operations.php index 98e5f1bec6..10d7cd3c19 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -49,11 +49,11 @@ PMA_DBI_select_db($GLOBALS['db']); require './libraries/tbl_info.inc.php'; // define some globals here, for improved syntax in the conditionals -$is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; +$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false; // set initial value of these globals, based on the current table engine PMA_set_global_variables_for_engine($tbl_type); -if ($is_maria) { +if ($is_aria) { // the value for transactional can be implicit // (no create option found, in this case it means 1) // or explicit (option found with a value of 0 or 1) @@ -95,7 +95,7 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); - if ($is_maria) { + if ($is_aria) { $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; } @@ -106,7 +106,7 @@ if (isset($_REQUEST['submitoptions'])) { $table_alters[] = 'DEFAULT ' . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']); } - if (($is_myisam_or_maria || $is_isam) + if (($is_myisam_or_aria || $is_isam) && isset($_REQUEST['new_pack_keys']) && $_REQUEST['new_pack_keys'] != (string)$pack_keys) { $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys']; @@ -114,37 +114,37 @@ if (isset($_REQUEST['submitoptions'])) { $checksum = empty($checksum) ? '0' : '1'; $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_checksum'] !== $checksum) { $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum']; } $_REQUEST['new_transactional'] = empty($_REQUEST['new_transactional']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_transactional'] !== $transactional) { $table_alters[] = 'TRANSACTIONAL = ' . $_REQUEST['new_transactional']; } $_REQUEST['new_page_checksum'] = empty($_REQUEST['new_page_checksum']) ? '0' : '1'; - if ($is_maria + if ($is_aria && $_REQUEST['new_page_checksum'] !== $page_checksum) { $table_alters[] = 'PAGE_CHECKSUM = ' . $_REQUEST['new_page_checksum']; } $delay_key_write = empty($delay_key_write) ? '0' : '1'; $_REQUEST['new_delay_key_write'] = empty($_REQUEST['new_delay_key_write']) ? '0' : '1'; - if ($is_myisam_or_maria + if ($is_myisam_or_aria && $_REQUEST['new_delay_key_write'] !== $delay_key_write) { $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write']; } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_auto_increment']) && (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) { $table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']); } - if (($is_myisam_or_maria || $is_innodb || $is_pbxt) + if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($_REQUEST['new_row_format']) && (! isset($row_format) || strtolower($_REQUEST['new_row_format']) !== strtolower($row_format))) { $table_alters[] = 'ROW_FORMAT = ' . PMA_sqlAddslashes($_REQUEST['new_row_format']); @@ -364,7 +364,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { @@ -384,7 +384,7 @@ if ($is_myisam_or_maria || $is_isam) { 0 - && ($is_myisam_or_maria || $is_innodb || $is_pbxt)) { + && ($is_myisam_or_aria || $is_innodb || $is_pbxt)) { ?> 0 // option values as keys then the dropdown option labels $possible_row_formats = array( + 'ARIA' => array( + 'FIXED' => 'FIXED', + 'DYNAMIC' => 'DYNAMIC', + 'PAGE' => 'PAGE' + ), 'MARIA' => array( 'FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', @@ -570,8 +575,8 @@ if (isset($possible_row_formats[$tbl_type])) {