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

re: bug 978930, LIMIT not displayed anymore

Browse Source
This commit is contained in:
Marc Delisle
2004-09-24 17:37:34 +00:00
parent 3bd2a9732f
commit 043140d096
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-09-24 Marc Delisle <lem9@users.sourceforge.net>
* sql.php: following the fix for bug #978930, the added LIMIT was
not displayed anymore
2004-09-24 Michal Čihař <michal@cihar.com> 2004-09-24 Michal Čihař <michal@cihar.com>
* libraries/export/sql.php: Fixed export of '0' string (bug #1033869). * libraries/export/sql.php: Fixed export of '0' string (bug #1033869).

4
sql.php
View File

@@ -319,12 +319,15 @@ else {
} else { } else {
$full_sql_query = $sql_query . $sql_limit_to_append; $full_sql_query = $sql_query . $sql_limit_to_append;
} }
if (isset($display_query)) { if (isset($display_query)) {
if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) { if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
$display_query = $regs[1] . $sql_limit_to_append . $regs[3]; $display_query = $regs[1] . $sql_limit_to_append . $regs[3];
} else { } else {
$display_query = $display_query . $sql_limit_to_append; $display_query = $display_query . $sql_limit_to_append;
} }
} else {
$display_query = $full_sql_query;
} }
} else { } else {
$full_sql_query = $sql_query; $full_sql_query = $sql_query;
@@ -494,7 +497,6 @@ else {
} }
// run the count query // run the count query
//DEBUG echo "trace cq=" . $count_query . "<br/>";
if (PMA_MYSQL_INT_VERSION < 40000) { if (PMA_MYSQL_INT_VERSION < 40000) {
if ($cnt_all_result = PMA_DBI_try_query($count_query)) { if ($cnt_all_result = PMA_DBI_try_query($count_query)) {