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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-02-09 16:54:16 +01:00
commit 4a8d77cc69
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -53,6 +53,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

20
libraries/operations.lib.php
View File

@ -1847,26 +1847,24 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
/**
* set initial value of the set of variables, based on the current table engine
*
* @param string $tbl_storage_engine table storage engine
* @param string $tbl_storage_engine table storage engine in upper case
*
* @return array ($is_myisam_or_aria, $is_innodb, $is_isam,
* $is_berkeleydb, $is_aria, $is_pbxt)
*/
function PMA_setGlobalVariablesForEngine($tbl_storage_engine)
{
$upperTblStorEngine = $tbl_storage_engine;
//Options that apply to MYISAM usually apply to ARIA
$is_myisam_or_aria = ($upperTblStorEngine == 'MYISAM'
|| $upperTblStorEngine == 'ARIA'
|| $upperTblStorEngine == 'MARIA'
$is_myisam_or_aria = ($tbl_storage_engine == 'MYISAM'
|| $tbl_storage_engine == 'ARIA'
|| $tbl_storage_engine == 'MARIA'
);
$is_aria = ($upperTblStorEngine == 'ARIA');
$is_aria = ($tbl_storage_engine == 'ARIA');
$is_isam = ($upperTblStorEngine == 'ISAM');
$is_innodb = ($upperTblStorEngine == 'INNODB');
$is_berkeleydb = ($upperTblStorEngine == 'BERKELEYDB');
$is_pbxt = ($upperTblStorEngine == 'PBXT');
$is_isam = ($tbl_storage_engine == 'ISAM');
$is_innodb = ($tbl_storage_engine == 'INNODB');
$is_berkeleydb = ($tbl_storage_engine == 'BERKELEYDB');
$is_pbxt = ($tbl_storage_engine == 'PBXT');
return array(
$is_myisam_or_aria, $is_innodb, $is_isam,

4
tbl_operations.php
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