From b3f038596068ce3677126f96b58becd06cc48226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 26 May 2004 11:44:10 +0000 Subject: [PATCH] PMA_DBI_num_rows is not needed and does not work with MYSQL_USE_RESULT (bug #952162). --- ChangeLog | 2 ++ tbl_properties.inc.php | 2 +- tbl_properties_operations.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d75d09312..d70ccab16 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ $Source$ * lang/dutch: Update thanks to Ivo Teel - calimonk. * lang/german-utf-8: Remove duplicated string. * lang/*: Remove allow_recoding from non utf-8 translations. + * tbl_properties.inc.php, tbl_properties_operations.php: PMA_DBI_num_rows + is not needed and does not work with MYSQL_USE_RESULT (bug #952162). 2004-05-26 Alexander M. Turek * translators.html: Linked to Indonesian translator's SF page instead of diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php index b4566abeb..c72fc0a3b 100644 --- a/tbl_properties.inc.php +++ b/tbl_properties.inc.php @@ -541,7 +541,7 @@ if ($action == 'tbl_create.php') { if ($action == 'tbl_create.php') { // find mysql capability - staybyte - 11. June 2001 $result = PMA_DBI_try_query('SHOW VARIABLES LIKE \'have_%\';'); - if ($result != FALSE && PMA_DBI_num_rows($result) > 0) { + if ($result) { while ($tmp = PMA_DBI_fetch_assoc($result)) { if (isset($tmp['Variable_name'])) { switch ($tmp['Variable_name']) { diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 574bffa7e..789179486 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -383,7 +383,7 @@ if ($cfgRelation['relwork'] && $tbl_type != "INNODB") { 0) { + if ($result) { while ($tmp = PMA_DBI_fetch_assoc($result)) { if (isset($tmp['Variable_name'])) { switch ($tmp['Variable_name']) {