Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8db83c630522f5792d9cd8cefd2412e5385a7c2 https://github.com/phpmyadmin/phpmyadmin/commit/f8db83c630522f5792d9cd8cefd2... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-26 (Sat, 26 Nov 2016)

Changed paths: M libraries/tbl_partition_definition.inc.php

Log Message: ----------- Using zero value in input's value makes JS block it even if partitions are not being created

Use blank value in HTML instead

Fix #12736

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: a2e9a6cbde50cb7b40b8c62c78031a9d44191ba9 https://github.com/phpmyadmin/phpmyadmin/commit/a2e9a6cbde50cb7b40b8c62c7803... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-26 (Sat, 26 Nov 2016)

Changed paths: M ChangeLog M libraries/php-gettext/gettext.inc

Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

Commit: 5fb3539cf2d8da8eb78bf14796a4d801354af826 https://github.com/phpmyadmin/phpmyadmin/commit/5fb3539cf2d8da8eb78bf14796a4... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-26 (Sat, 26 Nov 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #12736

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ec3150e486c...5fb3539cf2d8