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:
authorMarc Delisle <marc@infomarc.info>2015-12-14 03:41:55 +0300
committerMarc Delisle <marc@infomarc.info>2015-12-14 03:41:55 +0300
commit0a9bdc1619cf61990bf6d42ea2ff3e7c9a9e6b9c (patch)
tree00b4742f5cb6ac25f0080e0f079c584707366f8d /tbl_export.php
parent3f97698382c058e1085204b65606d57d33194bda (diff)
parentbf074566b54aa2101151f67c1e0d5daafaf5c9ea (diff)
Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'tbl_export.php')
-rw-r--r--tbl_export.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/tbl_export.php b/tbl_export.php
index deac625dc9..8c703f0197 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -106,7 +106,10 @@ if (! empty($sql_query)) {
'value_str' => '.',
)
),
- array()
+ array(
+ new SqlParser\Token($table),
+ new SqlParser\Token('.',SqlParser\Token::TYPE_OPERATOR)
+ )
);
}
$sql_query = SqlParser\TokensList::build($tokens);