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:
authorDeven Bansod <devenbansod.bits@gmail.com>2016-10-05 15:13:04 +0300
committerDeven Bansod <devenbansod.bits@gmail.com>2016-10-05 15:13:04 +0300
commitff91dc93f4ad76d25a0bcc7628eeb9ce1f0757aa (patch)
tree65a8c9b57aab8f6dc8a9124452c12686eeefa0fb /tbl_export.php
parent48d599e99b2829a0d294d3ec5a4ac863bef19c92 (diff)
parent0de5f6099f60544bbd3e5d385f2b3e8072f0ccec (diff)
Merge branch 'QA_4_6'
Diffstat (limited to 'tbl_export.php')
-rw-r--r--tbl_export.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tbl_export.php b/tbl_export.php
index fd6989d82e..46527133bc 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -67,7 +67,9 @@ if (! empty($sql_query)) {
}
// Rebuilding the SELECT and FROM clauses.
- if (count($parser->statements[0]->from) > 0) {
+ if (count($parser->statements[0]->from) > 0
+ && count($parser->statements[0]->union) === 0
+ ) {
$replaces = array(
array(
'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build(