Merge branch 'QA_4_6'

ChangeLog

@@ -68,6 +68,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

libraries/rte/rte_routines.lib.php

@@ -656,7 +656,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);
     }