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

Merge branch 'QA_4_5'

Browse Source
This commit is contained in:
Michal Čihař 2015-12-21 11:31:22 +01:00
commit 47a5ece9c1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/operations.lib.php
View File

@ -1861,7 +1861,7 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
*/
function PMA_setGlobalVariablesForEngine($tbl_storage_engine)
{
$upperTblStorEngine = /*overload*/mb_strtoupper($tbl_storage_engine);
$upperTblStorEngine = $tbl_storage_engine;
//Options that apply to MYISAM usually apply to ARIA
$is_myisam_or_aria = ($upperTblStorEngine == 'MYISAM'

5
tbl_operations.php
View File

@ -57,9 +57,6 @@ $GLOBALS['dbi']->selectDb($GLOBALS['db']);
*/
require 'libraries/tbl_info.inc.php';
// define some variables here, for improved syntax in the conditionals
$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = false;
$is_aria = $is_pbxt = false;
// set initial value of these variables, based on the current table engine
list($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt
@ -136,7 +133,7 @@ if (isset($_REQUEST['submitoptions'])) {
}
if (! empty($_REQUEST['new_tbl_storage_engine'])
&& /*overload*/mb_strtolower($_REQUEST['new_tbl_storage_engine']) !== /*overload*/mb_strtolower($tbl_storage_engine)
&& /*overload*/mb_strtolower($_REQUEST['new_tbl_storage_engine']) !== $tbl_storage_engine
) {
$new_tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
// reset the globals for the new engine