Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

2014-06-18 18:06:11 +02:00 · 2014-06-18 18:06:11 +02:00 · c01de87ef6
commit c01de87ef6
parent 8b93864670 1b56db7daf
2 changed files with 2 additions and 0 deletions
--- a/1
+++ b/1
@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - bug #4457 SQL tab - Insert queries not showing affected row count
 - bug       Missing warning about existing account, on multi-server config
 - bug #4435 WHERE clause can be undefined
+- bug       SQL export views as tables option getting ignored

 4.2.3.0 (2014-06-08)
 - bug #4423 Moving fields not working
--- a/export.php
+++ b/export.php
@ -126,6 +126,7 @@ if (!defined('TESTSUITE')) {
            'sql_hex_for_binary',
            'sql_utc_time',
            'sql_drop_database',
+            'sql_views_as_tables',
            'csv_separator',
            'csv_enclosed',
            'csv_escaped',