diff --git a/ChangeLog b/ChangeLog index 5899211d5..db18744ad 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ $Source$ 2005-10-25 Michal Čihař * lang/english: "Log in" is correct naming for action (RFE #945440). * 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 that rendered page contains change, that has been just done. diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index ade8563b9..81f7cf366 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -65,7 +65,10 @@ if (isset($submitoptions)) { $sql_query .= (isset($new_checksum) ? ' checksum=1': ' checksum=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) : ''; } $result = PMA_DBI_query($sql_query); @@ -380,7 +383,10 @@ for ($i = 0; $i < $num_dbs; $i++) { // DELAY_KEY_WRITE, CHECKSUM, : MyISAM only // 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') { ?>
@@ -409,7 +415,7 @@ for ($i = 0; $i < $num_dbs; $i++) { = 50003)) { + if ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB') { ?> style="width: 30px; vertical-align: middle" />