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

bug #1036678

Browse Source
This commit is contained in:
Marc Delisle
2004-09-29 19:56:04 +00:00
parent 5b5e82a867
commit f213938455
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-09-29 Marc Delisle <lem9@users.sourceforge.net>
* sql.php, libraries/common.lib.php: bug #1036678, incorrect appending
of LIMIT to queries
2004-09-29 Michal Čihař <michal@cihar.com>
* tbl_addfield.php, tbl_create.php, tbl_properties.inc.php, lang/*: Better
wording when adding fields (bug #991096).

13
libraries/common.lib.php
View File

@@ -1579,6 +1579,19 @@ if (typeof(document.getElementById) != 'undefined'
} else {
$query_base = $local_query;
}
// Here we append the LIMIT added for navigation, to
// enable its display. Adding it higher in the code
// to $local_query would create a problem when
// using the Refresh or Edit links
// FIXME: what would be the best to do when someone
// hits Refresh: use the current LIMITs ?
if (isset($GLOBALS['sql_limit_to_append'])) {
$query_base .= $GLOBALS['sql_limit_to_append'];
}
if (!empty($GLOBALS['show_as_php'])) {
$query_base = '$sql = \'' . $query_base;
} else if (!empty($GLOBALS['validatequery'])) {

3
sql.php
View File

@@ -326,8 +326,6 @@ else {
} else {
$display_query = $display_query . $sql_limit_to_append;
}
} else {
$display_query = $full_sql_query;
}
} else {
$full_sql_query = $sql_query;
@@ -468,7 +466,6 @@ else {
// (SELECT
$count_query = PMA_SQP_formatHtml($parsed_sql, 'query_only', 0, $analyzed_sql[0]['position_of_first_select'] + 1);
$count_query .= ' SQL_CALC_FOUND_ROWS ';
// add everything that was after the first SELECT
$count_query .= PMA_SQP_formatHtml($parsed_sql, 'query_only', $analyzed_sql[0]['position_of_first_select']+1);
} else { // PMA_MYSQL_INT_VERSION < 40000