Merge branch 'QA_3_3'

This commit is contained in:
Herman van Rink
2010-04-14 14:10:12 +02:00
2 changed files with 3 additions and 1 deletions

View File

@@ -77,6 +77,8 @@ $Id$
thanks to Madhura Jayaratne - madhuracj thanks to Madhura Jayaratne - madhuracj
- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work,
thanks to Björn Wiberg - bwiberg 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) 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

View File

@@ -193,7 +193,7 @@ unset($reread_info);
*/ */
require_once './libraries/tbl_links.inc.php'; 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 // set to success by default, because result set could be empty
// (for example, a table rename) // (for example, a table rename)
$_type = 'success'; $_type = 'success';