gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMA_DBI_free_result --> PMA_DBI_freeResult

Browse Source
This commit is contained in:
Kasun Chathuranga 2013-05-04 08:33:49 +05:30
parent d454b41564
commit 1c884f0cca
45 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db_printview.php
View File

@ -44,7 +44,7 @@ if ($cfg['SkipLockedTables'] == true) {
$sot_cache[$tmp[0]] = true;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (isset($sot_cache)) {
$result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
@ -58,7 +58,7 @@ if ($cfg['SkipLockedTables'] == true) {
$tables[] = array('Name' => $tmp[0]);
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$sot_ready = true;
}
}
@ -72,7 +72,7 @@ if (! isset($sot_ready)) {
while ($sts_tmp = PMA_DBI_fetchAssoc($result)) {
$tables[] = $sts_tmp;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
unset($res);
}
}

2
libraries/DBQbe.class.php
View File

@ -296,7 +296,7 @@ class PMA_DbQbe
} // end foreach
} // end if
} // end while
PMA_DBI_free_result($all_tables);
PMA_DBI_freeResult($all_tables);
// sets the largest width found
$this->_realwidth = $this->_form_column_width . 'ex';

2
libraries/DbSearch.class.php
View File

@ -153,7 +153,7 @@ class PMA_DbSearch
*
* @todo can we make use of fulltextsearch IN BOOLEAN MODE for this?
* PMA_backquote
* PMA_DBI_free_result
* PMA_DBI_freeResult
* PMA_DBI_fetchAssoc
* $GLOBALS['db']
* explode

2
libraries/DisplayResults.class.php
View File

@ -5517,7 +5517,7 @@ class PMA_DisplayResults
$dispval = __('Link not found');
}
@PMA_DBI_free_result($dispresult);
@PMA_DBI_freeResult($dispresult);
} else {
$dispval = '';

4
libraries/List_Database.class.php
View File

@ -489,7 +489,7 @@ class PMA_List_Database extends PMA_List
} // end if ... elseif ...
} // end while
} // end else
PMA_DBI_free_result($tmp_alldbs);
PMA_DBI_freeResult($tmp_alldbs);
unset($tmp_mydbs);
} // end if
@ -505,7 +505,7 @@ class PMA_List_Database extends PMA_List
$dblist[] = $row['Db'];
}
} // end while
PMA_DBI_free_result($rs);
PMA_DBI_freeResult($rs);
} // end if
}
}

2
libraries/StorageEngine.class.php
View File

@ -279,7 +279,7 @@ class PMA_StorageEngine
= PMA_ENGINE_DETAILS_TYPE_PLAINTEXT;
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
return $mysql_vars;
}

6
libraries/Table.class.php
View File

@ -552,7 +552,7 @@ class PMA_Table
);
if (!PMA_DBI_getError()) {
$row_count = PMA_DBI_num_rows($result);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
}
}
@ -680,7 +680,7 @@ class PMA_Table
$last_id = PMA_DBI_insert_id();
} // end while
PMA_DBI_free_result($table_copy_rs);
PMA_DBI_freeResult($table_copy_rs);
return $last_id;
}
@ -983,7 +983,7 @@ class PMA_Table
. ')';
PMA_queryAsControlUser($new_comment_query);
} // end while
PMA_DBI_free_result($comments_copy_rs);
PMA_DBI_freeResult($comments_copy_rs);
unset($comments_copy_rs);
}

2
libraries/Util.class.php
View File

@ -3186,7 +3186,7 @@ class PMA_Util
$srid = $wktarr[1];
$wktval = "'" . $wktval . "'," . $srid;
}
@PMA_DBI_free_result($wktresult);
@PMA_DBI_freeResult($wktresult);
return $wktval;
}

2
libraries/check_user_privileges.lib.php
View File

@ -135,7 +135,7 @@ function PMA_analyseShowGrant()
} // end if
} // end while
PMA_DBI_free_result($rs_usr);
PMA_DBI_freeResult($rs_usr);
// must also cacheUnset() them in
// libraries/plugins/auth/AuthenticationCookie.class.php

2
libraries/core.lib.php
View File

@ -329,7 +329,7 @@ function PMA_getTableCount($db)
);
if ($tables) {
$num_tables = PMA_DBI_num_rows($tables);
PMA_DBI_free_result($tables);
PMA_DBI_freeResult($tables);
} else {
$num_tables = 0;
}

8
libraries/database_interface.lib.php
View File

@ -1002,7 +1002,7 @@ function PMA_DBI_getDatabasesFull($database = null, $force_stats = false,
$databases[$database_name]['SCHEMA_LENGTH']
+= $row['Data_length'] + $row['Index_length'];
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res);
}
}
@ -1614,7 +1614,7 @@ function PMA_DBI_fetchValue($result, $row_number = 0, $field = 0, $link = null)
for ($i = 0; $i <= $row_number; $i++) {
$row = $fetch_function($result);
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
// return requested field
if (isset($row[$field])) {
@ -1669,7 +1669,7 @@ function PMA_DBI_fetchSingleRow($result, $type = 'ASSOC', $link = null)
}
$row = $fetch_function($result);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $row;
}
@ -1806,7 +1806,7 @@ function PMA_DBI_fetchResult($result, $key = null, $value = null,
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $resultrows;
}

8
libraries/db_info.inc.php
View File

@ -78,7 +78,7 @@ if (true === $cfg['SkipLockedTables']) {
$sot_cache[$tmp[0]] = true;
}
}
PMA_DBI_free_result($db_info_result);
PMA_DBI_freeResult($db_info_result);
if (isset($sot_cache)) {
$db_info_result = PMA_DBI_query(
@ -93,7 +93,7 @@ if (true === $cfg['SkipLockedTables']) {
. ' LIKE \'' . PMA_Util::sqlAddSlashes($tmp[0], true) . '\';'
);
$sts_tmp = PMA_DBI_fetchAssoc($sts_result);
PMA_DBI_free_result($sts_result);
PMA_DBI_freeResult($sts_result);
unset($sts_result);
if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
@ -123,13 +123,13 @@ if (true === $cfg['SkipLockedTables']) {
$sot_ready = true;
} elseif ($db_info_result) {
PMA_DBI_free_result($db_info_result);
PMA_DBI_freeResult($db_info_result);
}
unset($sot_cache);
}
unset($tmp);
} elseif ($db_info_result) {
PMA_DBI_free_result($db_info_result);
PMA_DBI_freeResult($db_info_result);
}
}

4
libraries/db_table_exists.lib.php
View File

@ -64,7 +64,7 @@ if (empty($is_table)
null, PMA_DBI_QUERY_STORE
);
$is_table = @PMA_DBI_num_rows($_result);
PMA_DBI_free_result($_result);
PMA_DBI_freeResult($_result);
}
} else {
$is_table = false;
@ -87,7 +87,7 @@ if (empty($is_table)
PMA_DBI_QUERY_STORE
);
$is_table = ($_result && @PMA_DBI_num_rows($_result));
PMA_DBI_free_result($_result);
PMA_DBI_freeResult($_result);
}
if (! $is_table) {

2
libraries/dbi/drizzle.dbi.lib.php
View File

@ -251,7 +251,7 @@ function PMA_DBI_dataSeek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
if ($result instanceof PMA_DrizzleResult) {
$result->free();

2
libraries/dbi/dummy.lib.php
View File

@ -428,7 +428,7 @@ function PMA_DBI_dataSeek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
return;
}

2
libraries/dbi/mysql.dbi.lib.php
View File

@ -276,7 +276,7 @@ function PMA_DBI_dataSeek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
if (is_resource($result) && get_resource_type($result) === 'mysql result') {
mysql_free_result($result);

2
libraries/dbi/mysqli.dbi.lib.php
View File

@ -336,7 +336,7 @@ function PMA_DBI_dataSeek($result, $offset)
*
* @return void
*/
function PMA_DBI_free_result($result)
function PMA_DBI_freeResult($result)
{
if ($result instanceof mysqli_result) {
mysqli_free_result($result);

4
libraries/insert_edit.lib.php
View File

@ -1938,7 +1938,7 @@ function PMA_executeSqlQuery($url_params, $query)
$last_message->addParam($insert_id);
$last_messages[] = $last_message;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$warning_messages = PMA_getWarningMessages();
}
@ -1997,7 +1997,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison,
if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) {
list($dispval) = PMA_DBI_fetchRow($dispresult, 0);
}
@PMA_DBI_free_result($dispresult);
@PMA_DBI_freeResult($dispresult);
return $dispval;
}
return '';

4
libraries/mult_submits.inc.php
View File

@ -95,7 +95,7 @@ if (! empty($submit_mult)
$primary .= $row['Column_name'] . ', ';
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (empty($primary)) {
// no primary key, so we can safely create new
unset($submit_mult);
@ -374,7 +374,7 @@ if (!empty($submit_mult) && !empty($what)) {
$primary .= $row['Column_name'] . ', ';
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$rebuild_database_list = false;

4
libraries/mysql_charsets.lib.php
View File

@ -29,7 +29,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) {
$mysql_charsets_descriptions[$row['CHARACTER_SET_NAME']]
= $row['DESCRIPTION'];
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
sort($mysql_charsets, SORT_STRING);
@ -60,7 +60,7 @@ if (! PMA_Util::cacheExists('mysql_charsets', true)) {
= !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])
|| !empty($mysql_collations_available[$row['COLLATION_NAME']]);
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res, $row);
if (PMA_DRIZZLE

4
libraries/plugins/export/ExportCodegen.class.php
View File

@ -255,7 +255,7 @@ class ExportCodegen extends ExportPlugin
while ($row = PMA_DBI_fetchRow($result)) {
$tableProperties[] = new TableProperty($row);
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$lines[] = 'using System;';
$lines[] = 'using System.Collections;';
$lines[] = 'using System.Collections.Generic;';
@ -365,7 +365,7 @@ class ExportCodegen extends ExportPlugin
);
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$lines[] = ' </class>';
$lines[] = '</hibernate-mapping>';

2
libraries/plugins/export/ExportCsv.class.php
View File

@ -336,7 +336,7 @@ class ExportCsv extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}

2
libraries/plugins/export/ExportHtmlword.class.php
View File

@ -251,7 +251,7 @@ class ExportHtmlword extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (! PMA_exportOutputHandler('</table>')) {
return false;
}

2
libraries/plugins/export/ExportJson.class.php
View File

@ -214,7 +214,7 @@ class ExportJson extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}
}

2
libraries/plugins/export/ExportLatex.class.php
View File

@ -403,7 +403,7 @@ class ExportLatex extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
} // end getTableLaTeX

2
libraries/plugins/export/ExportOds.class.php
View File

@ -324,7 +324,7 @@ class ExportOds extends ExportPlugin
} // end for
$GLOBALS['ods_buffer'] .= '</table:table-row>';
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$GLOBALS['ods_buffer'] .= '</table:table>';

2
libraries/plugins/export/ExportOdt.class.php
View File

@ -319,7 +319,7 @@ class ExportOdt extends ExportPlugin
} // end for
$GLOBALS['odt_buffer'] .= '</table:table-row>';
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$GLOBALS['odt_buffer'] .= '</table:table>';

2
libraries/plugins/export/ExportPhparray.class.php
View File

@ -219,7 +219,7 @@ class ExportPhparray extends ExportPlugin
return false;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}
}

6
libraries/plugins/export/ExportSql.class.php
View File

@ -977,7 +977,7 @@ class ExportSql extends ExportPlugin
$new_crlf = $this->_exportComment() . $crlf;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
$schema_create .= $new_crlf;
@ -1295,7 +1295,7 @@ class ExportSql extends ExportPlugin
$schema_create .= ($compat != 'MSSQL') ? $auto_increment : '';
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $schema_create . ($add_semicolon ? ';' . $crlf : '');
} // end of the 'getTableDef()' function
@ -1869,7 +1869,7 @@ class ExportSql extends ExportPlugin
}
}
} // end if ($result != false)
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
} // end of the 'exportData()' function

2
libraries/plugins/export/ExportTexytext.class.php
View File

@ -227,7 +227,7 @@ class ExportTexytext extends ExportPlugin
return false;
}
} // end while
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
}

2
libraries/plugins/export/ExportXml.class.php
View File

@ -479,7 +479,7 @@ class ExportXml extends ExportPlugin
return false;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
return true;

2
libraries/plugins/export/ExportYaml.class.php
View File

@ -206,7 +206,7 @@ class ExportYaml extends ExportPlugin
return false;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return true;
} // end getTableYAML

4
libraries/plugins/export/PMA_ExportPdf.class.php
View File

@ -391,7 +391,7 @@ class PMA_ExportPdf extends PMA_PDF
ksort($this->tablewidths);
PMA_DBI_free_result($this->results);
PMA_DBI_freeResult($this->results);
// Pass 2
@ -400,7 +400,7 @@ class PMA_ExportPdf extends PMA_PDF
$this->AddPage();
$this->SetFont(PMA_PDF_FONT, '', 9);
$this->morepagestable($this->FontSizePt);
PMA_DBI_free_result($this->results);
PMA_DBI_freeResult($this->results);
} // end of mysqlReport function

2
libraries/plugins/import/ImportLdi.class.php
View File

@ -53,7 +53,7 @@ class ImportLdi extends AbstractImportCsv
$GLOBALS['cfg']['Import']['ldi_local_option'] = true;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
unset($result);
}

10
libraries/relation.lib.php
View File

@ -422,7 +422,7 @@ function PMA__getRelationsParam()
$cfgRelation['userconfig'] = $curr_table[0];
}
} // end while
PMA_DBI_free_result($tab_rs);
PMA_DBI_freeResult($tab_rs);
if (isset($cfgRelation['relation'])) {
$cfgRelation['relwork'] = true;
@ -708,7 +708,7 @@ function PMA_getDbComment($db)
$row = PMA_DBI_fetchAssoc($com_rs);
$comment = $row['comment'];
}
PMA_DBI_free_result($com_rs);
PMA_DBI_freeResult($com_rs);
}
return $comment;
@ -740,7 +740,7 @@ function PMA_getDbComments()
$comments[$row['db_name']] = $row['comment'];
}
}
PMA_DBI_free_result($com_rs);
PMA_DBI_freeResult($com_rs);
}
return $comments;
@ -1128,7 +1128,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
$res = PMA_DBI_query('SELECT COUNT(*)' . $f_query_from . $f_query_filter);
if ($res) {
$the_total = PMA_DBI_fetchValue($res);
@PMA_DBI_free_result($res);
@PMA_DBI_freeResult($res);
} else {
$the_total = 0;
}
@ -1144,7 +1144,7 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte
while ($single_disp_row = @PMA_DBI_fetchAssoc($disp)) {
$disp_row[] = $single_disp_row;
}
@PMA_DBI_free_result($disp);
@PMA_DBI_freeResult($disp);
}
} else {
$disp_row = null;

2
libraries/rte/rte_routines.lib.php
View File

@ -1415,7 +1415,7 @@ function PMA_RTN_handleExecute()
$output .= "<br/>";
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
} while (PMA_DBI_next_result());

2
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -1301,7 +1301,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
}
} // end while
if ($result) {
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
/**

2
libraries/schema/User_Schema.class.php
View File

@ -431,7 +431,7 @@ class PMA_User_Schema
echo ' <option value="' . $pages['page_nr'] . '">'
. $pages['page_nr'] . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
} // end while
PMA_DBI_free_result($test_rs);
PMA_DBI_freeResult($test_rs);
unset($test_rs);
?>
</select><br />

20
libraries/server_privileges.lib.php
View File

@ -405,7 +405,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*',
$row[$row1[0]] = 'N';
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
} else {
$row = array('Table_priv' => '');
}
@ -455,7 +455,7 @@ function PMA_getHtmlToDisplayPrivilegesTable($db = '*',
'References' => false
);
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
}
unset($res, $row1);
}
@ -590,7 +590,7 @@ function PMA_getHtmlForTableSpecificPrivileges($username, $hostname, $db,
$columns[$row1[0]][$current] = true;
}
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res, $row1, $current);
$html_output = '<input type="hidden" name="grant_count" '
@ -2074,7 +2074,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$db_rights[$db_rights_row[$dbOrTableName]] = $db_rights_row;
}
PMA_DBI_free_result($db_rights_result);
PMA_DBI_freeResult($db_rights_result);
if (! strlen($dbname)) {
$sql_query = 'SELECT * FROM `mysql`.`db`'
@ -2105,7 +2105,7 @@ function PMA_getUserSpecificRights($tables, $user_host_condition, $dbname)
$db_rights[$row['Db']]['can_delete'] = true;
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
return $db_rights;
}
@ -2340,7 +2340,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
$pred_tbl_array[] = $row[0];
}
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (! empty($pred_tbl_array)) {
$html_output .= '<select name="pred_tablename" '
@ -2383,7 +2383,7 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage,
$row['privs'] = PMA_extractPrivInfo($row, true);
$db_rights[$row['User']][$row['Host']] = $row;
}
@PMA_DBI_free_result($result);
@PMA_DBI_freeResult($result);
$html_output
= '<form name="usersForm" id="usersForm" action="server_privileges.php" '
@ -2668,7 +2668,7 @@ function PMA_getDbRightsForUserOverview()
$db_rights[$db_rights_row['User']][$db_rights_row['Host']]
= $db_rights_row;
}
PMA_DBI_free_result($db_rights_result);
PMA_DBI_freeResult($db_rights_result);
ksort($db_rights);
return $db_rights;
@ -2936,7 +2936,7 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
if (! $res) {
$html_output .= PMA_Message::error(__('No Privileges'))->getDisplay();
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
unset($res);
} else {
// This message is hardcoded because I will replace it by
@ -3209,7 +3209,7 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
. '\'@\'' . PMA_Util::sqlAddSlashes($hostname) . '\''
. ($row['Grant_priv'] == 'Y' ? ' WITH GRANT OPTION;' : ';');
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
$queries = PMA_getTablePrivsQueriesForChangeOrCopyUser(
$user_host_condition, $queries, $username, $hostname

2
libraries/transformations.lib.php
View File

@ -284,7 +284,7 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation,
if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
$row = @PMA_DBI_fetchAssoc($test_rs);
PMA_DBI_free_result($test_rs);
PMA_DBI_freeResult($test_rs);
if (! $forcedelete
&& (strlen($mimetype) || strlen($transformation)

4
pmd_relation_new.php
View File

@ -45,7 +45,7 @@ if (PMA_Util::isForeignKeySupported($type_T1)
while ($row = PMA_DBI_fetchAssoc($result)) {
$index_array1[$row['Column_name']] = 1;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$result = PMA_DBI_query(
'SHOW INDEX FROM ' . PMA_Util::backquote($db)
@ -55,7 +55,7 @@ if (PMA_Util::isForeignKeySupported($type_T1)
while ($row = PMA_DBI_fetchAssoc($result)) {
$index_array2[$row['Column_name']] = 1;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if (! empty($index_array1[$F1]) && ! empty($index_array2[$F2])) {
$upd_query = 'ALTER TABLE ' . PMA_Util::backquote($db)

2
server_plugins.php
View File

@ -48,7 +48,7 @@ while ($row = PMA_DBI_fetchAssoc($res)) {
$modules[$row['module_name']]['info'] = $row;
$modules[$row['module_name']]['plugins'][$row['plugin_type']][] = $row;
}
PMA_DBI_free_result($res);
PMA_DBI_freeResult($res);
// sort plugin list (modules are already sorted)
ksort($plugins);

8
server_status_monitor.php
View File

@ -213,7 +213,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$return['sum']['TOTAL'] = array_sum($return['sum']);
$return['numRows'] = count($return['rows']);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
PMA_Response::getInstance()->addJSON('message', $return);
exit;
@ -313,7 +313,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$return['sum']['TOTAL'] = array_sum($return['sum']);
$return['numRows'] = count($return['rows']);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
PMA_Response::getInstance()->addJSON('message', $return);
exit;
@ -374,7 +374,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
// In case an error happened
$return['error'] = PMA_DBI_getError();
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
if ($profiling) {
$return['profiling'] = array();
@ -385,7 +385,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
while ($row = PMA_DBI_fetchAssoc($result)) {
$return['profiling'][]= $row;
}
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
PMA_Response::getInstance()->addJSON('message', $return);

4
sql.php
View File

@ -1271,7 +1271,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
);
$html_output .= $displayResultsObject->getTable($result, $disp_mode, $analyzed_sql);
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
}
// BEGIN INDEX CHECK See if indexes should be checked.
@ -1609,7 +1609,7 @@ function getTableHtmlForMultipleQueries(
);
// Free the result to save the memory
PMA_DBI_free_result($result);
PMA_DBI_freeResult($result);
$sql_no++;

2
tbl_create.php
View File

@ -269,7 +269,7 @@ if (isset($_REQUEST['do_save_data'])) {
. ' LIKE \'' . PMA_Util::sqlAddSlashes($table, true) . '\';'
);
$tbl_stats = PMA_DBI_fetchAssoc($tbl_stats_result);
PMA_DBI_free_result($tbl_stats_result);
PMA_DBI_freeResult($tbl_stats_result);
unset($tbl_stats_result);
if ($is_show_stats) {