diff --git a/ChangeLog b/ChangeLog index 29c11f5a6..d8dbf59e6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-01-30 Marc Delisle + * libraries/export/sql.php: bug #1108521, part 2: mysqli_num_rows + cannot be used with MYSQL_USE_RESULT + 2005-01-29 Alexander M. Turek * lang/japanese-utf-8.inc.php: Bug #1111855 ("Undefined index" when using the Janapese language file under MySQL 4.1. diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 036bc37f2..79d3d455d 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -183,8 +183,8 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) $auto_increment = ''; $new_crlf = $crlf; - - $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\''); + // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli + $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\'', NULL, PMA_DBI_QUERY_STORE); if ($result != FALSE) { if (PMA_DBI_num_rows($result) > 0) { $tmpres = PMA_DBI_fetch_assoc($result);