diff --git a/ChangeLog b/ChangeLog
index 9a9544b05..de8313741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,
   thanks to JT Justman - jtjustman
+- bug #2491017 [operations] ANSI mode not supported (db rename and table move) 
 
 3.1.3.0 (2009-02-28)
 + [lang] Turkish update, thanks to Burak Yavuz
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 05211b9c6..09a60d731 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -660,7 +660,9 @@ class PMA_Table
             }
             unset($analyzed_sql);
             $server_sql_mode = PMA_DBI_fetch_value("SHOW VARIABLES LIKE 'sql_mode'", 0, 1);
-            if ('ANSI_QUOTES' == $server_sql_mode) {
+            // ANSI_QUOTES might be a subset of sql_mode, for example 
+            // REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
+            if (false !== strpos($server_sql_mode, 'ANSI_QUOTES')) {
                 $table_delimiter = 'quote_double';
             } else {
                 $table_delimiter = 'quote_backtick';