diff --git a/ChangeLog b/ChangeLog
index a11e94729..d17fd8c77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.2.3.0 (not yet released)
 - patch #2856664 [export] Date, time, and datetime column types now export correctly to
   OpenOffice Spreadsheet, thanks to Thomas Pulickal - jemajoign
+- patch #2859788 [parser] Double-character delimiters (bug #2846239), 
+  thanks to Thomas Pulickal - jemajoign
 
 3.2.2.0 (2009-09-13)
 - bug #2825293 [structure] Default value for a BIT column
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index f87a0eac7..eed5e3c1a 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -585,7 +585,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                             break;
                     }
                     PMA_SQP_arrayAdd($sql_array, 'punct' . $t_suffix, $punct_data, $arraysize);
-                } elseif (PMA_STR_binarySearchInArr($punct_data, $allpunct_list_pair, $allpunct_list_pair_size)) {
+                } elseif ($punct_data == $GLOBALS['sql_delimiter'] || PMA_STR_binarySearchInArr($punct_data, $allpunct_list_pair, $allpunct_list_pair_size)) {
                     // Ok, we have one of the valid combined punct expressions
                     PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize);
                 } else {