gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6

Browse Source
This commit is contained in:
Isaac Bennetch 2016-11-25 23:30:07 -05:00
commit 88bbbcf27d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.6.5.1 (2016-11-25)
- 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

6
libraries/tbl_partition_definition.inc.php
View File

@ -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