Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2012-03-26 20:46:35 +0400
committerMadhura Jayaratne <madhura.cj@gmail.com>2012-03-26 20:46:35 +0400
commit90b2d663175ec912905e542c1557040a90d8d49b (patch)
treedf523ed2ebcb63e1ca67dc9b0e88307ae59b6e2f /sql.php
parent486c53526ab314be1749ae1f7cb163669d4be873 (diff)
parent54084929a50a8be2a797972b65d637102b33d47b (diff)
Merge branch 'QA_3_5'
Diffstat (limited to 'sql.php')
-rw-r--r--sql.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql.php b/sql.php
index 432fb141b5..952d7ebba3 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;