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

start work on Maria table options

Browse Source
This commit is contained in:
Marc Delisle
2008-03-16 13:24:35 +00:00
parent 128219bf92
commit b11306d521
2 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/tbl_info.inc.php
View File

@@ -36,7 +36,6 @@ global $showtable, $tbl_is_view, $tbl_type, $show_comment, $tbl_collation,
// otherwise error #1046, no database selected // otherwise error #1046, no database selected
PMA_DBI_select_db($GLOBALS['db']); PMA_DBI_select_db($GLOBALS['db']);
// The 'show table' statement works correct since 3.23.03
$table_info_result = PMA_DBI_query( $table_info_result = PMA_DBI_query(
'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], true) . '\';', 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], true) . '\';',
null, PMA_DBI_QUERY_STORE); null, PMA_DBI_QUERY_STORE);

61
tbl_operations.php
View File

@@ -47,6 +47,11 @@ PMA_DBI_select_db($GLOBALS['db']);
require './libraries/tbl_info.inc.php'; 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 = false;
// set initial value of these globals, based on the current table engine
PMA_set_global_variables_for_engine($tbl_type);
$reread_info = false; $reread_info = false;
$table_alters = array(); $table_alters = array();
@@ -75,6 +80,8 @@ if (isset($_REQUEST['submitoptions'])) {
&& strtolower($_REQUEST['new_tbl_type']) !== strtolower($tbl_type)) { && strtolower($_REQUEST['new_tbl_type']) !== strtolower($tbl_type)) {
$table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_type']; $table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_type'];
$tbl_type = $_REQUEST['new_tbl_type']; $tbl_type = $_REQUEST['new_tbl_type'];
// reset the globals for the new engine
PMA_set_global_variables_for_engine($tbl_type);
} }
if (! empty($_REQUEST['tbl_collation']) if (! empty($_REQUEST['tbl_collation'])
@@ -82,9 +89,7 @@ if (isset($_REQUEST['submitoptions'])) {
$table_alters[] = 'DEFAULT ' . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']); $table_alters[] = 'DEFAULT ' . PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']);
} }
$l_tbl_type = strtolower($tbl_type); if (($is_myisam_or_maria || $is_isam)
if (($l_tbl_type === 'myisam' || $l_tbl_type === 'isam')
&& isset($_REQUEST['new_pack_keys']) && isset($_REQUEST['new_pack_keys'])
&& $_REQUEST['new_pack_keys'] != (string)$pack_keys) { && $_REQUEST['new_pack_keys'] != (string)$pack_keys) {
$table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys']; $table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys'];
@@ -92,19 +97,19 @@ if (isset($_REQUEST['submitoptions'])) {
$checksum = empty($checksum) ? '0' : '1'; $checksum = empty($checksum) ? '0' : '1';
$_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1'; $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1';
if (($l_tbl_type === 'myisam') if ($is_myisam_or_maria
&& $_REQUEST['new_checksum'] !== $checksum) { && $_REQUEST['new_checksum'] !== $checksum) {
$table_alters[] = 'checksum = ' . $_REQUEST['new_checksum']; $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum'];
} }
$delay_key_write = empty($delay_key_write) ? '0' : '1'; $delay_key_write = empty($delay_key_write) ? '0' : '1';
$_REQUEST['new_delay_key_write'] = empty($_REQUEST['new_delay_key_write']) ? '0' : '1'; $_REQUEST['new_delay_key_write'] = empty($_REQUEST['new_delay_key_write']) ? '0' : '1';
if (($l_tbl_type === 'myisam') if ($is_myisam_or_maria
&& $_REQUEST['new_delay_key_write'] !== $delay_key_write) { && $_REQUEST['new_delay_key_write'] !== $delay_key_write) {
$table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write']; $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write'];
} }
if (($l_tbl_type === 'myisam' || $l_tbl_type === 'innodb') if (($is_myisam_or_maria || $is_innodb)
&& ! empty($_REQUEST['new_auto_increment']) && ! empty($_REQUEST['new_auto_increment'])
&& (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) { && (! isset($auto_increment) || $_REQUEST['new_auto_increment'] !== $auto_increment)) {
$table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']); $table_alters[] = 'auto_increment = ' . PMA_sqlAddslashes($_REQUEST['new_auto_increment']);
@@ -299,10 +304,10 @@ if (strstr($show_comment, '; InnoDB free') === false) {
</td> </td>
</tr> </tr>
<?php <?php
if ($tbl_type == 'MYISAM' || $tbl_type == 'ISAM') { if ($is_myisam_or_maria || $is_isam) {
?> ?>
<tr> <tr>
<td><label for="new_pack_keys">pack_keys</label></td> <td><label for="new_pack_keys">PACK_KEYS</label></td>
<td><select name="new_pack_keys" id="new_pack_keys"> <td><select name="new_pack_keys" id="new_pack_keys">
<option value="DEFAULT" <option value="DEFAULT"
<?php if ($pack_keys == 'DEFAULT') echo 'selected="selected"'; ?> <?php if ($pack_keys == 'DEFAULT') echo 'selected="selected"'; ?>
@@ -319,9 +324,9 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'ISAM') {
<?php <?php
} // end if (MYISAM|ISAM) } // end if (MYISAM|ISAM)
if ($tbl_type == 'MYISAM') { if ($is_myisam_or_maria) {
?> ?>
<tr><td><label for="new_checksum">checksum</label></td> <tr><td><label for="new_checksum">CHECKSUM</label></td>
<td><input type="checkbox" name="new_checksum" id="new_checksum" <td><input type="checkbox" name="new_checksum" id="new_checksum"
value="1" value="1"
<?php echo (isset($checksum) && $checksum == 1) <?php echo (isset($checksum) && $checksum == 1)
@@ -330,7 +335,7 @@ if ($tbl_type == 'MYISAM') {
</td> </td>
</tr> </tr>
<tr><td><label for="new_delay_key_write">delay_key_write</label></td> <tr><td><label for="new_delay_key_write">DELAY_KEY_WRITE</label></td>
<td><input type="checkbox" name="new_delay_key_write" id="new_delay_key_write" <td><input type="checkbox" name="new_delay_key_write" id="new_delay_key_write"
value="1" value="1"
<?php echo (isset($delay_key_write) && $delay_key_write == 1) <?php echo (isset($delay_key_write) && $delay_key_write == 1)
@@ -343,7 +348,7 @@ if ($tbl_type == 'MYISAM') {
} // end if (MYISAM) } // end if (MYISAM)
if (isset($auto_increment) && strlen($auto_increment) > 0 if (isset($auto_increment) && strlen($auto_increment) > 0
&& ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB')) { && ($is_myisam_or_maria || $is_innodb)) {
?> ?>
<tr><td><label for="auto_increment_opt">auto_increment</label></td> <tr><td><label for="auto_increment_opt">auto_increment</label></td>
<td><input type="text" name="new_auto_increment" id="auto_increment_opt" <td><input type="text" name="new_auto_increment" id="auto_increment_opt"
@@ -430,8 +435,9 @@ if (isset($auto_increment) && strlen($auto_increment) > 0
<ul> <ul>
<?php <?php
if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB') { // Note: BERKELEY (BDB) is no longer supported, starting with MySQL 5.1
if ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB') { if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) {
if ($is_myisam_or_maria || $is_innodb) {
$this_url_params = array_merge($url_params, $this_url_params = array_merge($url_params,
array('sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table']))); array('sql_query' => 'CHECK TABLE ' . PMA_backquote($GLOBALS['table'])));
?> ?>
@@ -441,7 +447,7 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB')
</li> </li>
<?php <?php
} }
if ($tbl_type == 'INNODB') { if ($is_innodb) {
$this_url_params = array_merge($url_params, $this_url_params = array_merge($url_params,
array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB')); array('sql_query' => 'ALTER TABLE ' . PMA_backquote($GLOBALS['table']) . ' ENGINE = InnoDB'));
?> ?>
@@ -451,7 +457,7 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB')
</li> </li>
<?php <?php
} }
if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB') { if ($is_myisam_or_maria || $is_berkeleydb) {
$this_url_params = array_merge($url_params, $this_url_params = array_merge($url_params,
array('sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table']))); array('sql_query' => 'ANALYZE TABLE ' . PMA_backquote($GLOBALS['table'])));
?> ?>
@@ -461,7 +467,7 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB')
</li> </li>
<?php <?php
} }
if ($tbl_type == 'MYISAM') { if ($is_myisam_or_maria) {
$this_url_params = array_merge($url_params, $this_url_params = array_merge($url_params,
array('sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table']))); array('sql_query' => 'REPAIR TABLE ' . PMA_backquote($GLOBALS['table'])));
?> ?>
@@ -471,7 +477,7 @@ if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB')
</li> </li>
<?php <?php
} }
if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB' || $tbl_type == 'INNODB') { if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) {
$this_url_params = array_merge($url_params, $this_url_params = array_merge($url_params,
array('sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table']))); array('sql_query' => 'OPTIMIZE TABLE ' . PMA_backquote($GLOBALS['table'])));
?> ?>
@@ -550,7 +556,7 @@ $this_url_params = array_merge($url_params,
// so I assume that if the current table is InnoDB, I don't display // so I assume that if the current table is InnoDB, I don't display
// this choice (InnoDB maintains integrity by itself) // this choice (InnoDB maintains integrity by itself)
if ($cfgRelation['relwork'] && $tbl_type != "INNODB") { if ($cfgRelation['relwork'] && ! $is_innodb) {
PMA_DBI_select_db($GLOBALS['db']); PMA_DBI_select_db($GLOBALS['db']);
$foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table']); $foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table']);
@@ -604,4 +610,21 @@ if ($cfgRelation['relwork'] && $tbl_type != "INNODB") {
* Displays the footer * Displays the footer
*/ */
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
function PMA_set_global_variables_for_engine($tbl_type)
{
global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb;
$is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = false;
$upper_tbl_type = strtoupper($tbl_type);
//Options that apply to MYISAM usually apply to MARIA
$is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA');
$is_isam = ($upper_tbl_type == 'ISAM');
$is_innodb = ($upper_tbl_type == 'INNODB');
$is_berkeleydb = ($upper_tbl_type == 'BERKELEYDB');
}
?> ?>