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

bug #2983065 Error when changing from Maria to MyISAM engine

Browse Source
This commit is contained in:
Marc Delisle
2010-04-25 07:09:39 -04:00
parent acdf39e95b
commit e9ee6cf1d1
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table - bug #2983062, patch #2989408 [engines] Fix warnings when changing table
engine to Maria, thanks to Madhura Jayaratne. engine to Maria, thanks to Madhura Jayaratne.
- bug #2974067 [display] non-binary fields shown as hex - 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) 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

8
tbl_operations.php
View File

@@ -157,11 +157,19 @@ if (isset($_REQUEST['submitoptions'])) {
$reread_info = true; $reread_info = true;
unset($table_alters); unset($table_alters);
foreach (PMA_DBI_get_warnings() as $warning) { foreach (PMA_DBI_get_warnings() as $warning) {
// 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_messages[] = $warning['Level'] . ': #' . $warning['Code']
. ' ' . $warning['Message']; . ' ' . $warning['Message'];
} }
} }
} }
}
/** /**
* Reordering the table has been requested by the user * Reordering the table has been requested by the user
*/ */