Merge branch 'QA_4_6'

2016-09-13 11:06:07 +02:00 · 2016-09-13 11:06:07 +02:00 · d3df461714
commit d3df461714
parent 30f7244707 16474f3dde
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -54,6 +54,8 @@ phpMyAdmin - ChangeLog
 - issue #12531 Properly detect DROP DATABASE queries
 - issue #12470 Fix possible race condition in setting URL hash
 - issue #11924 Remove caching of server information
+- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
+- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries

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