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

Merge branch 'QA_4_1'

Browse Source
This commit is contained in:
Marc Delisle 2013-12-08 09:29:28 -05:00
commit 9a2b3b5608
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/sql.lib.php
View File

@ -2272,9 +2272,10 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
$full_sql_query = $sql_query;
// Handle remembered sorting order, only for single table query
// Handling is not required when its a union query
// Handling is not required when it's a union query
// (the parser never sets the 'union' key to 0)
if (PMA_isRememberSortingOrder($analyzed_sql_results)
&& $analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']==null
&& ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['union'])
) {
PMA_handleSortOrder($db, $table, $analyzed_sql_results, $full_sql_query);
}