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

Changed some queries to use MYSQLI_STORE_RESULT.

Browse Source 
phpMyAdmin now works with MYSQLI_USE_RESULT as default.
This commit is contained in:
Marcel Tschopp
2004-04-10 16:27:23 +00:00
parent 4e62f7658f
commit 16de478154
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@@ -6,15 +6,15 @@ $Id$
$Source$
2004-04-10 Marcel Tschopp <marcel.tschopp@gmx.net>
db_datadict.php, db_details_db_info.php, db_details_qbe.php,
db_details_structure.php, db_printview.php, left.php, main.php,
pdf_pages.php, read_dump.php, server_privileges.php, sql.php,
tbl_change.php, tbl_indexes.php, tbl_properties_structure.php,
tbl_relation.php, tbl_select.php, libraries/database_interface.lib.php,
libraries/db_table_exists.lib.php, libraries/mysql_charsets.lib.php,
libraries/relation.lib.php, libraries/dbi/mysqli.dbi.lib.php:
Changed some queries to use MYSQLI_STORE_RESULT. phpMyAdmin now works
with MYSQLI_USE_RESULT as default.
* db_datadict.php, db_details_db_info.php, db_details_qbe.php,
db_details_structure.php, db_printview.php, left.php, main.php,
pdf_pages.php, read_dump.php, server_privileges.php, sql.php,
tbl_change.php, tbl_indexes.php, tbl_properties_structure.php,
tbl_relation.php, tbl_select.php, libraries/database_interface.lib.php,
libraries/db_table_exists.lib.php, libraries/mysql_charsets.lib.php,
libraries/relation.lib.php, libraries/dbi/mysqli.dbi.lib.php:
Changed some queries to use MYSQLI_STORE_RESULT. phpMyAdmin now works
with MYSQLI_USE_RESULT as default.
2004-04-07 Marc Delisle <lem9@users.sourceforge.net>
* tbl_select.php, lang/*: feature 788608: new features for Search:

8
libraries/relation.lib.php
View File

@@ -24,14 +24,14 @@
*
* @author Mike Beck <mikebeck@users.sourceforge.net>
*/
function PMA_query_as_cu($sql, $show_error = TRUE) {
function PMA_query_as_cu($sql, $show_error = TRUE, $options) {
global $err_url_0, $db, $dbh, $cfgRelation;
PMA_DBI_select_db($cfgRelation['db'], $dbh);
if ($show_error) {
$result = PMA_DBI_query($sql, $dbh);
$result = PMA_DBI_query($sql, $dbh, $options);
} else {
$result = PMA_DBI_try_query($sql, $dbh);
$result = PMA_DBI_try_query($sql, $dbh, $options);
} // end if... else...
PMA_DBI_select_db($db, $dbh);
@@ -104,7 +104,7 @@ function PMA_getRelationsParam($verbose = FALSE)
// PMA_DBI_select_db($cfgRelation['db']);
$tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']);
$tab_rs = PMA_query_as_cu($tab_query, NULL, PMA_DBI_QUERY_STORE);
$tab_rs = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE);
while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) {
if ($curr_table[0] == $cfg['Server']['bookmarktable']) {

2
sql.php
View File

@@ -319,7 +319,7 @@ else {
list($usec, $sec) = explode(' ',microtime());
$querytime_before = ((float)$usec + (float)$sec);
$result = @PMA_DBI_try_query($full_sql_query, NULL, true);
$result = @PMA_DBI_try_query($full_sql_query, NULL, PMA_DBI_QUERY_STORE);
list($usec, $sec) = explode(' ',microtime());
$querytime_after = ((float)$usec + (float)$sec);