Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--browse_foreigners.php4
-rw-r--r--db_datadict.php6
-rw-r--r--db_details_db_info.php6
-rw-r--r--db_details_qbe.php2
-rw-r--r--db_printview.php6
-rw-r--r--db_search.php8
-rw-r--r--export.php4
-rw-r--r--left.php4
-rw-r--r--read_dump.php2
-rw-r--r--sql.php2
-rw-r--r--tbl_indexes.php2
11 files changed, 23 insertions, 23 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 5461bc39f2..50715033b2 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -229,10 +229,10 @@ echo $header;
* Close MySql connections
*/
if (isset($dbh) && $dbh) {
- @mysql_close($dbh);
+ @PMA_DBI_close($dbh);
}
if (isset($userlink) && $userlink) {
- @mysql_close($userlink);
+ @PMA_DBI_close($userlink);
}
diff --git a/db_datadict.php b/db_datadict.php
index e9bbca4489..56194b4723 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -82,7 +82,7 @@ while ($row = PMA_mysql_fetch_array($rowset)) {
$num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
$show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
if ($result) {
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
}
@@ -126,7 +126,7 @@ while ($row = PMA_mysql_fetch_array($rowset)) {
} // end while
if ($result) {
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
}
@@ -282,7 +282,7 @@ while ($row = PMA_mysql_fetch_array($rowset)) {
</tr>
<?php
} // end while
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
echo "\n";
?>
diff --git a/db_details_db_info.php b/db_details_db_info.php
index 113d262096..1087230fae 100644
--- a/db_details_db_info.php
+++ b/db_details_db_info.php
@@ -28,7 +28,7 @@ if ($cfg['SkipLockedTables'] == TRUE) {
$sot_cache[$tmp[0]] = TRUE;
}
}
- mysql_free_result($db_info_result);
+ PMA_DBI_free_result($db_info_result);
if (isset($sot_cache)) {
$local_query = 'SHOW TABLES FROM ' . PMA_backquote($db);
@@ -44,7 +44,7 @@ if ($cfg['SkipLockedTables'] == TRUE) {
$tables[] = array('Name' => $tmp[0]);
}
}
- mysql_free_result($db_info_result);
+ PMA_DBI_free_result($db_info_result);
$sot_ready = TRUE;
}
}
@@ -57,7 +57,7 @@ if (!isset($sot_ready)) {
while ($sts_tmp = PMA_mysql_fetch_array($db_info_result)) {
$tables[] = $sts_tmp;
}
- mysql_free_result($db_info_result);
+ PMA_DBI_free_result($db_info_result);
}
}
$num_tables = (isset($tables) ? count($tables) : 0);
diff --git a/db_details_qbe.php b/db_details_qbe.php
index c25968f93d..f9d88efa0c 100644
--- a/db_details_qbe.php
+++ b/db_details_qbe.php
@@ -159,7 +159,7 @@ while ($i < $tbl_result_cnt) {
$i++;
} // end if
-mysql_free_result($tbl_result);
+PMA_DBI_free_result($tbl_result);
// largest width found
$realwidth = $wid . 'ex';
diff --git a/db_printview.php b/db_printview.php
index 4e592696a6..316f8b4d95 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -42,7 +42,7 @@ if ($cfg['SkipLockedTables'] == TRUE) {
$sot_cache[$tmp[0]] = TRUE;
}
}
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
if (isset($sot_cache)) {
$local_query = 'SHOW TABLES FROM ' . PMA_backquote($db);
@@ -58,7 +58,7 @@ if ($cfg['SkipLockedTables'] == TRUE) {
$tables[] = array('Name' => $tmp[0]);
}
}
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
$sot_ready = TRUE;
}
}
@@ -71,7 +71,7 @@ if (!isset($sot_ready)) {
while ($sts_tmp = PMA_mysql_fetch_array($result)) {
$tables[] = $sts_tmp;
}
- mysql_free_result($result);
+ PMA_DBI_free_result($result);
}
}
$num_tables = (isset($tables) ? count($tables) : 0);
diff --git a/db_search.php b/db_search.php
index 5f68ee95d8..48fe2be494 100644
--- a/db_search.php
+++ b/db_search.php
@@ -26,7 +26,7 @@ for ($i = 0; $i < $num_tables; $i++) {
$tables[] = PMA_mysql_tablename($list_tables, $i);
}
if ($num_tables) {
- mysql_free_result($list_tables);
+ PMA_DBI_free_result($list_tables);
}
@@ -72,7 +72,7 @@ if (isset($submit_search)) {
$sqlstr_fieldstoselect = ' ' . implode(', ', $tblfields);
$tblfields_cnt = count($tblfields);
if ($res) {
- mysql_free_result($res);
+ PMA_DBI_free_result($res);
}
// Table to use
@@ -191,7 +191,7 @@ if (isset($submit_search)) {
$res = @PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, $err_url);
if ($res) {
$res_cnt = PMA_mysql_result($res, 0, 'count');
- mysql_free_result($res);
+ PMA_DBI_free_result($res);
} else {
$res_cnt = 0;
} // end if... else ...
@@ -230,7 +230,7 @@ if (isset($submit_search)) {
$res = @PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, $err_url);
if ($res) {
$res_cnt = PMA_mysql_result($res, 0, 'count');
- mysql_free_result($res);
+ PMA_DBI_free_result($res);
} else {
$res_cnt = 0;
} // end if... else ...
diff --git a/export.php b/export.php
index 081c22bbc0..7ba6d7fbf5 100644
--- a/export.php
+++ b/export.php
@@ -310,7 +310,7 @@ if (!$save_on_server) {
// Check if we have something to export
if ($export_type == 'database') {
$tables = PMA_mysql_list_tables($db);
- $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+ $num_tables = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
if ($num_tables == 0) {
$message = $strNoTablesFound;
$js_to_run = 'functions.js';
@@ -370,7 +370,7 @@ if ($export_type == 'server') {
PMA_exportDBHeader($current_db);
PMA_exportDBCreate($current_db);
$tables = PMA_mysql_list_tables($current_db);
- $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+ $num_tables = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
$i = 0;
while ($i < $num_tables) {
$table = PMA_mysql_tablename($tables, $i);
diff --git a/left.php b/left.php
index 3ac93ada58..2b6208158e 100644
--- a/left.php
+++ b/left.php
@@ -407,7 +407,7 @@ if ($num_dbs > 1) {
$selected_db = $j;
}
$tables = @PMA_mysql_list_tables($db);
- $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+ $num_tables = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
$common_url_query = PMA_generate_common_url($db);
if ($num_tables) {
$num_tables_disp = $num_tables;
@@ -619,7 +619,7 @@ if ($num_dbs > 1) {
else if ($num_dbs == 1) {
$db = $dblist[0];
$tables = @PMA_mysql_list_tables($db);
- $num_tables = ($tables) ? @mysql_numrows($tables) : 0;
+ $num_tables = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
$common_url_query = PMA_generate_common_url($db);
if ($num_tables) {
$num_tables_disp = $num_tables;
diff --git a/read_dump.php b/read_dump.php
index f12bee6055..39497e5107 100644
--- a/read_dump.php
+++ b/read_dump.php
@@ -348,7 +348,7 @@ if ($goto == 'tbl_properties.php') {
} else {
PMA_mysql_select_db($db);
$is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
- if (!($is_table && @mysql_numrows($is_table))) {
+ if (!($is_table && @PMA_DBI_num_rows($is_table))) {
$goto = 'db_details.php';
unset($table);
}
diff --git a/sql.php b/sql.php
index 87cb03bb3f..e58d8763e2 100644
--- a/sql.php
+++ b/sql.php
@@ -559,7 +559,7 @@ else {
$goto = 'db_details.php';
} else {
$is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
- if (!($is_table && @mysql_numrows($is_table))) {
+ if (!($is_table && @PMA_DBI_num_rows($is_table))) {
$goto = 'db_details.php';
unset($table);
}
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 82956adee0..1358b55194 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -40,7 +40,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
$is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
}
if (empty($table)
- || !($is_table && @mysql_numrows($is_table))) {
+ || !($is_table && @PMA_DBI_num_rows($is_table))) {
header('Location: ' . $cfg['PmaAbsoluteUri'] . $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
exit;
} else if (isset($is_table)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 20:07:28 +0300