From 96071655352ab316d2760c141613bebb72c8b2db Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 13 Apr 2010 15:06:00 -0400 Subject: [PATCH 1/2] 3.3.2 release --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3cd06064c..7210b829a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, thanks to Björn Wiberg - bwiberg -3.3.2.0 (not yet released) +3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing From 55572a531ca411d9a449f409150ffb0836a111d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 14 Apr 2010 14:09:10 +0200 Subject: [PATCH 2/2] Patch #2986708: Fix for the bug #2983066 --- ChangeLog | 2 ++ tbl_operations.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7210b829a..5df54a14d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Madhura Jayaratne - madhuracj - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, thanks to Björn Wiberg - bwiberg +- bug #2983066 [interface] Flush table on table operations shows the query twice, + thanks to Martynas Mickevičius - BlinK_ 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 d0453070c..a0e9514a5 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -193,7 +193,7 @@ unset($reread_info); */ require_once './libraries/tbl_links.inc.php'; -if (isset($result)) { +if (isset($result) && empty($zero_rows)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success';