The branch, master has been updated via 72b18cbb9d216cb850700589a184e9ea3e9fc458 (commit) via 55572a531ca411d9a449f409150ffb0836a111d9 (commit) via 96071655352ab316d2760c141613bebb72c8b2db (commit) from e2ef709f49e647b190f28f4a991b94c7b466a765 (commit)

- Log ----------------------------------------------------------------- commit 72b18cbb9d216cb850700589a184e9ea3e9fc458 Merge: e2ef709f49e647b190f28f4a991b94c7b466a765 55572a531ca411d9a449f409150ffb0836a111d9 Author: Herman van Rink rink@initfour.nl Date: Wed Apr 14 14:10:12 2010 +0200

Merge branch 'QA_3_3'

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

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

diff --git a/ChangeLog b/ChangeLog index d0ecb1e..3f18b26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,8 @@ $Id$ 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 ad26638..7054bbc 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';

hooks/post-receive