Merge remote-tracking branch 'origin/pull/12815' into QA_4_6

ChangeLog

@@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
 - issue #12813 Fixed stored procedure execution
 - issue #12826 Honor user configured connection collation
 - issue #12293 Correctly report OpenSSL errors from cookie encryption
+- issue #12814 DateTime won't allow to input length in Routine editor
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

js/rte.js

@@ -792,8 +792,6 @@ RTE.ROUTINE = {
         // Process for parameter length
         switch ($type.val()) {
         case 'DATE':
-        case 'DATETIME':
-        case 'TIME':
         case 'TINYBLOB':
         case 'TINYTEXT':
         case 'BLOB':

libraries/rte/rte_routines.lib.php

@@ -1161,7 +1161,7 @@ function PMA_RTN_getQueryFromRequest()
                 }
                 if ($item_param_length[$i] != ''
                     && !preg_match(
-                        '@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|'
+                        '@^(DATE|TINYBLOB|TINYTEXT|BLOB|TEXT|'
                         . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|'
                         . 'SERIAL|BOOLEAN)$@i',
                         $item_param_type[$i]