Merge branch 'QA_4_6'

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-25 10:04:50 +02:00 · 2016-10-25 10:04:50 +02:00 · fa30f8e23b
commit fa30f8e23b
parent f82cc5b2e8 1ec99a431b
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -101,6 +101,8 @@ phpMyAdmin - ChangeLog
 - issue #12365 Fix records count for large tables
 - issue #12533 Fix records count for complex queries
 - issue #12454 Query history not updated in console until page refresh
+- issue #12344 Fixed parsing of labels in loop
+- issue #12228 Fixed parsing of BEGIN labels

 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29