diff --git a/ChangeLog b/ChangeLog index 0008b333ec..e7133bb637 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4841 Status page: Mislukte pogingen per uur value is incorrect - bug MIME Transformation link fixed - bug #4838 Prevents console window from moving out of the screen height +- bug #4829 Create procedure via SQL Editor not more possible 4.4.1.1 (2015-04-08) - bug #4846 Web server's error log is flooded diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php index 5e9c35f015..8226b57fcc 100644 --- a/libraries/plugins/import/ImportSql.class.php +++ b/libraries/plugins/import/ImportSql.class.php @@ -101,14 +101,16 @@ class ImportSql extends ImportPlugin */ private $_stringFunctions = array( self::READ_MB_FALSE => array( - 'substr' => 'substr', - 'strlen' => 'strlen', - 'strpos' => 'strpos', + 'substr' => 'substr', + 'strlen' => 'strlen', + 'strpos' => 'strpos', + 'strtoupper' => 'strtoupper', ), self::READ_MB_TRUE => array( - 'substr' => 'mb_substr', - 'strlen' => 'mb_strlen', - 'strpos' => 'mb_strpos', + 'substr' => 'mb_substr', + 'strlen' => 'mb_strlen', + 'strpos' => 'mb_strpos', + 'strtoupper' => 'mb_strtoupper', ), ); @@ -366,7 +368,8 @@ class ImportSql extends ImportPlugin } //If DELIMITER is found. - if ($specialChars === $this->_delimiterKeyword) { + $specialCharsUpper = $this->_stringFctToUse['strtoupper']($specialChars); + if ($specialCharsUpper === $this->_delimiterKeyword) { $this->_isInDelimiter = true; $this->_delimiterPosition = $this->_firstSearchChar + $this->_stringFctToUse['strlen']($specialChars);