From f8db83c630522f5792d9cd8cefd2412e5385a7c2 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sat, 26 Nov 2016 09:14:35 +0530 Subject: [PATCH 1/2] 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 --- libraries/tbl_partition_definition.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php index 0ec3dc6f0b..fb2f490ff5 100644 --- a/libraries/tbl_partition_definition.inc.php +++ b/libraries/tbl_partition_definition.inc.php @@ -28,14 +28,16 @@ if (!isset($partitionDetails)) { } else { $partition_count = 0; } - $partitionDetails['partition_count'] = $partition_count; + $partitionDetails['partition_count'] + = ($partition_count === 0) ? '' : $partition_count; if (PMA_isValid($_REQUEST['subpartition_count'], 'numeric')) { // MySQL's limit is 8192, so do not allow more $subpartition_count = min(intval($_REQUEST['subpartition_count']), 8192); } else { $subpartition_count = 0; } - $partitionDetails['subpartition_count'] = $subpartition_count; + $partitionDetails['subpartition_count'] + = ($subpartition_count === 0) ? '' : $subpartition_count; // Only LIST and RANGE type parameters allow subpartitioning $partitionDetails['can_have_subpartitions'] = $partition_count > 1 From 5fb3539cf2d8da8eb78bf14796a4d801354af826 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Sat, 26 Nov 2016 09:50:10 +0530 Subject: [PATCH 2/2] ChangeLog for #12736 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 70fd6ad236..9213f426d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.6.6 (not yet released) - issue #12735 Incorrect parameters to escapeString in Node.php - issue #12734 Fix PHP error when mbstring is not installed +- issue #12736 Don't force partition count to be specified when creating a new table 4.6.5 (2016-11-24) - issue Remove potentionally license problematic sRGB profile