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

remove old code

Browse Source
This commit is contained in:
Marc Delisle
2005-10-08 19:02:15 +00:00
parent 5c981c774f
commit fbdac06a9d
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ $Source$
2005-10-08 Marc Delisle <lem9@users.sourceforge.net> 2005-10-08 Marc Delisle <lem9@users.sourceforge.net>
* libraries/session.inc.php: workaround for warnings on session_start() * libraries/session.inc.php: workaround for warnings on session_start()
displayed on sf.net server displayed on sf.net server
* sql.php: remove old code
2005-10-08 Michal Čihař <michal@cihar.com> 2005-10-08 Michal Čihař <michal@cihar.com>
* libraries/display_export.lib.php: Use same formatting for all options. * libraries/display_export.lib.php: Use same formatting for all options.

12
sql.php
View File

@@ -331,22 +331,10 @@ else {
&& !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+$@i', $sql_query)) { && !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+$@i', $sql_query)) {
$sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'] . " "; $sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'] . " ";
// if (preg_match('@(.*)([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))$@i', $sql_query, $regs)) {
// $full_sql_query = $regs[1] . $sql_limit_to_append . $regs[2];
// } else {
// $full_sql_query = $sql_query . $sql_limit_to_append;
// }
$full_sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; $full_sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit'];
// FIXME: pretty printing of this modified query // FIXME: pretty printing of this modified query
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)) {
// $display_query = $regs[1] . $sql_limit_to_append . $regs[3];
// } else {
// $display_query = $display_query . $sql_limit_to_append;
// }
// if the analysis of the original query revealed that we found // if the analysis of the original query revealed that we found
// a section_after_limit, we now have to analyze $display_query // a section_after_limit, we now have to analyze $display_query
// to display it correctly // to display it correctly