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

[engines] Fix warnings when changing table engine to Maria.

Browse Source 
bug #2983062, patch #2989408
This commit is contained in:
Madhura Jayaratne
2010-04-20 10:20:58 +02:00
committed by Michal Čihař
parent 69dd779f40
commit 769aec95ef
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Martynas Mickevičius - BlinK_ thanks to Martynas Mickevičius - BlinK_
- bug #2983060, patch #2987900 [interface] Fix initial state of tables in - bug #2983060, patch #2987900 [interface] Fix initial state of tables in
designer, thanks to Sutharshan Balachandren. designer, thanks to Sutharshan Balachandren.
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table
engine to Maria, thanks to Madhura Jayaratne.
3.3.2.0 (2010-04-13) 3.3.2.0 (2010-04-13)
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the

4
tbl_operations.php
View File

@@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) {
$tbl_type = $_REQUEST['new_tbl_type']; $tbl_type = $_REQUEST['new_tbl_type'];
// reset the globals for the new engine // reset the globals for the new engine
PMA_set_global_variables_for_engine($tbl_type); PMA_set_global_variables_for_engine($tbl_type);
if ($is_maria) {
$transactional = (isset($transactional) && $transactional == '0') ? '0' : '1';
$page_checksum = (isset($page_checksum)) ? $page_checksum : '';
}
} }
if (! empty($_REQUEST['tbl_collation']) if (! empty($_REQUEST['tbl_collation'])