[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2078-gec263b9

[Marc Delisle]

The branch, master has been updated
       via  ec263b9170f89b033374ae8a1281d779693d8200 (commit)
       via  e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit)
      from  bd90d40defef2384145517c75cf1b185656327c9 (commit)


- Log -----------------------------------------------------------------
commit ec263b9170f89b033374ae8a1281d779693d8200
Merge: bd90d40defef2384145517c75cf1b185656327c9 e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Apr 25 07:10:20 2010 -0400

    Merge branch 'QA_3_3'

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

Summary of changes:
 ChangeLog          |    1 +
 tbl_operations.php |   12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b1906e..06d98cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@ $Id$
 - bug #2983062, patch #2989408 [engines] Fix warnings when changing table
   engine to Maria, thanks to Madhura Jayaratne.
 - bug #2974067 [display] non-binary fields shown as hex
+- bug #2983065 [operations] Error when changing from Maria to MyISAM engine
 
 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 87ccce9..04fd618 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -157,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) {
         $reread_info    = true;
         unset($table_alters);
         foreach (PMA_DBI_get_warnings() as $warning) {
-            $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
-                            . ' ' . $warning['Message'];
+            // In MariaDB 5.1.44, when altering a table from Maria to MyISAM 
+            // and if TRANSACTIONAL was set, the system reports an error;
+            // I discussed with a Maria developer and he agrees that this
+            // should not be reported with a Level of Error, so here
+            // I just ignore it. But there are other 1478 messages
+            // that it's better to show.
+            if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) {
+                $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
+                    . ' ' . $warning['Message'];
+            }
         }
     }
 }


hooks/post-receive
-- 
phpMyAdmin