diff --git a/ChangeLog b/ChangeLog
index 48073ec0d..e85e7a576 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-01-06 Alexander M. Turek  <singwhenyourewinning@derrabus.de>
+    * libraries/sqlparser.lib.php: Support for _charset syntax.
+
 2004-01-09 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.data.php: bug 873236 SQL_CALC_FOUND_ROWS
 
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index bcba595a3..ba5276eb6 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -630,7 +630,8 @@ if ($is_minimum_common == FALSE) {
                   $t_suffix = '_charset';
               }
             } elseif (PMA_STR_binarySearchInArr($d_cur, $mysql_charsets, $mysql_charsets_count)
-              || PMA_STR_binarySearchInArr($d_cur, $mysql_collations_flat, $mysql_collations_count)) {
+              || PMA_STR_binarySearchInArr($d_cur, $mysql_collations_flat, $mysql_collations_count)
+              || ($d_cur{0} == '_' && PMA_STR_binarySearchInArr(substr($d_cur, 1), $mysql_charsets, $mysql_charsets_count))) {
               $t_suffix = '_charset';
             } else {
               // Do nothing