Merge branch 'QA_4_5' into QA_4_6

This commit is contained in:
Michal Čihař 2016-02-09 16:53:06 +01:00
commit ef7114d850
2 changed files with 3 additions and 2 deletions

View File

@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
- issue #11881 Full processlist lost on refresh
- issue #11834 Adjust privileges fails if database name contains underscores
- issue #11906 'Loading...' banner shows on login screen
- issue #11930 Fixed changing of table parameters, eg. AUTO_INCREMENT
4.5.4.1 (2016-01-29)
- issue #11892 Error with PMA 4.4.15.3

View File

@ -128,9 +128,9 @@ if (isset($_REQUEST['submitoptions'])) {
}
if (! empty($_REQUEST['new_tbl_storage_engine'])
&& mb_strtolower($_REQUEST['new_tbl_storage_engine']) !== $tbl_storage_engine
&& mb_strtoupper($_REQUEST['new_tbl_storage_engine']) !== $tbl_storage_engine
) {
$new_tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
$new_tbl_storage_engine = mb_strtoupper($_REQUEST['new_tbl_storage_engine']);
// reset the globals for the new engine
list($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt