[Phpmyadmin-devel] Good to go into QA_3_5 ?

[Madhura Jayaratne]

On Mon, Mar 19, 2012 at 11:53 PM, Dieter Adriaenssens <
dieter.adriaenssens at gmail.com> wrote:

> Hi all,
>
> As a reminder :
>
> phpMyAdmin version 3.5.0 is to be released soon. This means that no
> commits should be done to the QA_3_5 branch, unless they solve a
> critical bug that should be solved before 3.5.0 is released.
> Because we are so close to the final release, please, only commit
> changes to the QA_3_5 branch after discussing this on the mailing list.
>
>  Hi all,

I came across this bug [1], which is present in QA_3_5 and master branches.
While I'm not sure whether this is critical the cause and the solution is
simple. I've included the diff of the solution at the end of this mail.
Good to go into QA_3_5 ?

-- 
Thanks and Regards,

Madhura Jayaratne

[1]
https://sourceforge.net/tracker/?func=detail&aid=3510784&group_id=23067&atid=377408

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e35f405..f40f61b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1120,6 +1120,7 @@ function PMA_showMessage($message, $sql_query = null,
$type = 'notice', $is_view
             ) {
                 $query_base =
$analyzed_display_query[0]['section_before_limit']
                     . "\n" . $GLOBALS['sql_order_to_append']
+                    . $analyzed_display_query[0]['limit_clause'] . ' '
                     . $analyzed_display_query[0]['section_after_limit'];

                 // Need to reparse query
diff --git a/sql.php b/sql.php
index 432fb14..952d7eb 100644
--- a/sql.php
+++ b/sql.php
@@ -467,7 +467,7 @@ if ($GLOBALS['cfg']['RememberSorting']
             // retrieve the remembered sorting order for current table
             $sql_order_to_append = ' ORDER BY ' . $sorted_col . ' ';
             $full_sql_query = $analyzed_sql[0]['section_before_limit'] .
$sql_order_to_append
-                . $analyzed_sql[0]['section_after_limit'];
+                . $analyzed_sql[0]['limit_clause'] . ' ' .
$analyzed_sql[0]['section_after_limit'];

             // update the $analyzed_sql
             $analyzed_sql[0]['section_before_limit'] .=
$sql_order_to_append;
--
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120324/50f19b4e/attachment.html>