Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a5ae580f2a82de9775cae743e446d3a177552ec https://github.com/phpmyadmin/phpmyadmin/commit/5a5ae580f2a82de9775cae743e44... Author: Pavel Rochnyack <pavel2000@ngs.ru> Date: 2016-08-14 (Sun, 14 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M po/ru.po M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. + Add 'COLUMNS Partitioning' support + Allow to edit partition names * Do not show duplicate partition names in 'Partition maintenance' snippet on 'Operations' tab. Caused by subpartitions presence. * Optimize Partition::getPartitionMethod() - need only one row, so use 'LIMIT 1' in query to avoid much data transfer from database. * Change HTML-code of partition comment textarea to avoid extra spaces added to value. * Added missing htmlspecialchars() on subpartitions comment. Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru> Commit: ba59178a75e11a6f4ca6fd2902b6d30b3827e8a1 https://github.com/phpmyadmin/phpmyadmin/commit/ba59178a75e11a6f4ca6fd2902b6... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Merge pull request #12430 from rpv-tomsk/improve-partitions-support Partitions editor: Allow to edit partition names; Add 'COLUMNS Partitioning' support. Commit: 1d3608b6a99cea8996ae349e8ccebb3a8aa7944e https://github.com/phpmyadmin/phpmyadmin/commit/1d3608b6a99cea8996ae349e8cce... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 Commit: 8f74b634301bb99aa8733bada84da7ea34e66562 https://github.com/phpmyadmin/phpmyadmin/commit/8f74b634301bb99aa8733bada84d... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-17 (Wed, 17 Aug 2016) Changed paths: M libraries/Partition.php M libraries/controllers/table/TableStructureController.php M libraries/create_addfield.lib.php M libraries/operations.lib.php M libraries/tbl_partition_definition.inc.php M templates/columns_definitions/partitions.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_structure.phtml Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9642fc2a649a...8f74b634301b