diff --git a/ChangeLog b/ChangeLog index 6e9668257..b4306c650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL$ +2.10.3.0 (not yet released) + +- bug #1734285 Copy database with VIEWs + 2.10.2.0 (not yet released) + [data] display all warnings, not only last one diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index de3c5dc25..c02997ea6 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2315,10 +2315,13 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) { } break; case 'quote_backtick': - if ($typearr[3] != 'punct_qualifier' && $typearr[3] != 'alpha_variable') { + // here we check for punct_user to handle correctly + // DEFINER = `username`@`%` + // where @ is the punct_user and `%` is the quote_backtick + if ($typearr[3] != 'punct_qualifier' && $typearr[3] != 'alpha_variable' && $typearr[3] != 'punct_user') { $after .= ' '; } - if ($typearr[1] != 'punct_qualifier' && $typearr[1] != 'alpha_variable') { + if ($typearr[1] != 'punct_qualifier' && $typearr[1] != 'alpha_variable' && $typearr[1] != 'punct_user') { $before .= ' '; } break;