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

phpmyadmin · May 24, 2013 · 5e04c4a · 5e04c4a
2 parents 76eaf7c + 71748b1
commit 5e04c4a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 263 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #3941 Recent tables list always empty
 - bug #3933 Do not translate "Open Document" in export settings
 - bug #3927 List of tables is missing after expanding in the navigation frame
+- bug #3942 Warnings about reserved word for many non reserved words 
 
 4.0.2.0 (not yet released)
 - bug #3902 Cannot browse when table name contains keyword "call"