From 38cb18b0deefa00c5e2257c02c61ad882da0ba04 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 20 Sep 2016 17:00:15 +0530 Subject: [PATCH 1/2] Fix #12242 : Edit routine detail dialog does not fill "Return length" field in mysql functions Use correct field to get the details about the length of returning value's datatype Signed-off-by: Deven Bansod --- libraries/rte/rte_routines.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 2db6fcf79c..37d7131879 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -654,7 +654,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true, $control = false) } $retval['item_returntype'] = $stmt->return->name; - $retval['item_returnlength'] = implode(',', $stmt->return->size); + $retval['item_returnlength'] = implode(',', $stmt->return->parameters); $retval['item_returnopts_num'] = implode(' ', $options); $retval['item_returnopts_text'] = implode(' ', $options); } From b463665b1384db2d6222765ae9f3e520dc33d9d7 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 20 Sep 2016 17:02:00 +0530 Subject: [PATCH 2/2] ChangeLog entry for #12242 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index a6cba5f334..d19ada2070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog - issue #12530 "Edit routine" crashes when the current user is not the definer, even if privileges are adequate - issue #12300 Export selective tables by-default dumps Events also - issue #12298 Fixed export of view definitions +- issue #12242 Edit routine detail dialog does not fill "Return length" field in mysql functions 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29