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

ignore version checks as it tends to be too complicated, see bug #1337873

Browse Source
This commit is contained in:
Michal Čihař
2005-10-25 22:25:43 +00:00
parent 2678154e2f
commit cdc95334c9
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,7 +8,7 @@ $Source$
2005-10-25 Michal Čihař <michal@cihar.com> 2005-10-25 Michal Čihař <michal@cihar.com>
* lang/english: "Log in" is correct naming for action (RFE #945440). * lang/english: "Log in" is correct naming for action (RFE #945440).
* tbl_properties_operations.php: Allow to change auto_increment for * tbl_properties_operations.php: Allow to change auto_increment for
InnoDB, supported since MySQL 5.0.3 (bug #1337873). InnoDB (bug #1337873).
* tbl_properties_operations.php: Reread table information after change, so * tbl_properties_operations.php: Reread table information after change, so
that rendered page contains change, that has been just done. that rendered page contains change, that has been just done.

12
tbl_properties_operations.php
View File

@@ -65,7 +65,10 @@ if (isset($submitoptions)) {
$sql_query .= (isset($new_checksum) ? ' checksum=1': ' checksum=0') $sql_query .= (isset($new_checksum) ? ' checksum=1': ' checksum=0')
. (isset($new_delay_key_write) ? ' delay_key_write=1': ' delay_key_write=0'); . (isset($new_delay_key_write) ? ' delay_key_write=1': ' delay_key_write=0');
} }
if ($tbl_type == 'MYISAM' ||($tbl_type == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50003)) { // nijel: Here should be version check for InnoDB, however it is supported
// in 5.0.x x>4, 4.1.y y>12 and also works in 4.0.11, so I decided not to
// check for version
if ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB') {
$sql_query .= !empty($new_auto_increment) ? ' auto_increment=' . PMA_sqlAddslashes($new_auto_increment) : ''; $sql_query .= !empty($new_auto_increment) ? ' auto_increment=' . PMA_sqlAddslashes($new_auto_increment) : '';
} }
$result = PMA_DBI_query($sql_query); $result = PMA_DBI_query($sql_query);
@@ -380,7 +383,10 @@ for ($i = 0; $i < $num_dbs; $i++) {
// DELAY_KEY_WRITE, CHECKSUM, : MyISAM only // DELAY_KEY_WRITE, CHECKSUM, : MyISAM only
// AUTO_INCREMENT: MyISAM and InnoDB since 5.0.3 // AUTO_INCREMENT: MyISAM and InnoDB since 5.0.3
if ($tbl_type == 'MYISAM' || $tbl_type == 'ISAM' || ($tbl_type == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50003)) { // nijel: Here should be version check for InnoDB, however it is supported
// in 5.0.x x>4, 4.1.y y>12 and also works in 4.0.11, so I decided not to
// check for version
if ($tbl_type == 'MYISAM' || $tbl_type == 'ISAM' || $tbl_type == 'INNODB') {
?> ?>
<!-- Table options --> <!-- Table options -->
<form method="post" action="tbl_properties_operations.php"> <form method="post" action="tbl_properties_operations.php">
@@ -409,7 +415,7 @@ for ($i = 0; $i < $num_dbs; $i++) {
<?php <?php
} // end if (MYISAM) } // end if (MYISAM)
if ($tbl_type == 'MYISAM' ||($tbl_type == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50003)) { if ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB') {
?> ?>
<input type="text" name="new_auto_increment" id="auto_increment_opt" class="textfield" <input type="text" name="new_auto_increment" id="auto_increment_opt" class="textfield"
<?php echo (isset($auto_increment) && !empty($auto_increment) ? ' value="' . $auto_increment . '"' : ''); ?> style="width: 30px; vertical-align: middle" />&nbsp;<label for="auto_increment_opt">auto_increment</label> <?php echo (isset($auto_increment) && !empty($auto_increment) ? ' value="' . $auto_increment . '"' : ''); ?> style="width: 30px; vertical-align: middle" />&nbsp;<label for="auto_increment_opt">auto_increment</label>