[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1655-g7f5be87

[Michal Čihař]

The branch, master has been updated
       via  7f5be87f3c82a6b120e5819c4c7d6b093b530d54 (commit)
       via  769aec95effaa407fc62778a23549b902fd586d9 (commit)
      from  1cafc3a509eca28246982ae29a0ba764bd73def6 (commit)


- Log -----------------------------------------------------------------
commit 7f5be87f3c82a6b120e5819c4c7d6b093b530d54
Merge: 1cafc3a509eca28246982ae29a0ba764bd73def6 769aec95effaa407fc62778a23549b902fd586d9
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Apr 20 10:22:26 2010 +0200

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    2 ++
 tbl_operations.php |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35d8773..0c03b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,8 @@ $Id$
   thanks to Martynas Mickevičius - BlinK_
 - bug #2983060, patch #2987900 [interface] Fix initial state of tables in
   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)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_operations.php b/tbl_operations.php
index 7054bbc..87ccce9 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) {
         $tbl_type = $_REQUEST['new_tbl_type'];
         // reset the globals for the new engine
         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'])


hooks/post-receive
-- 
phpMyAdmin