The branch, QA_3_3 has been updated via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) from acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit)
- Log ----------------------------------------------------------------- commit e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 25 07:09:39 2010 -0400
bug #2983065 Error when changing from Maria to MyISAM engine
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + tbl_operations.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 4bda4f7..0679157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - 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 e859b3c..98e5f1b 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
-
Marc Delisle