diff --git a/ChangeLog b/ChangeLog
index 1db745a95..f5c3801a9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,10 @@ $Source$
       libraries/dbi/mysqli.dbi.lib.php: Support for unbuffered queries - 
       PMA_DBI_QUERY_UNBUFFERED and fix support of PMA_DBI_QUERY_STORE.
     * libraries/export/*.php: Use unbuffered queries (patch #890075).
-    * libraries/export/sql.php, libraries/display_export.lib.php, lang/*:
-      Add support for INSERT IGNORE and UPDATE IGNORE.
+    * libraries/export/sql.php, libraries/display_export.lib.php, lang/*,
+      config.inc.php, libraries/common.lib.php,
+      libraries/config_import.lib.php: Add support for INSERT IGNORE and
+      UPDATE IGNORE.
 
 2004-03-09 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php, libraries/display*, lang/*: 
diff --git a/config.inc.php b/config.inc.php
index 3ae845d3a..085f33404 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -339,6 +339,7 @@ $cfg['Export']['sql_dates']                 = FALSE;
 $cfg['Export']['sql_relation']              = FALSE;
 $cfg['Export']['sql_columns']               = FALSE;
 $cfg['Export']['sql_delayed']               = FALSE;
+$cfg['Export']['sql_ignore']                = FALSE;
 $cfg['Export']['sql_type']                  = 'insert'; // insert/update/replace
 $cfg['Export']['sql_extended']              = FALSE;
 $cfg['Export']['sql_comments']              = FALSE;
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 8885f88f9..9a0dc400e 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -136,7 +136,7 @@ if (isset($cfg['FileRevision'])) {
 } else {
     $cfg['FileRevision'] = array(1, 1);
 }
-if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 9)) {
+if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 10)) {
     require_once('./libraries/config_import.lib.php');
 }
 
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 86ca24f86..37e2cf2de 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -1272,6 +1272,9 @@ if (!isset($cfg['Export']['sql_columns'])) {
 if (!isset($cfg['Export']['sql_delayed'])) {
     $cfg['Export']['sql_delayed'] = FALSE;
 }
+if (!isset($cfg['Export']['sql_ignore'])) {
+    $cfg['Export']['sql_ignore'] = FALSE;
+}
 if (!isset($cfg['Export']['sql_type'])) {
     $cfg['Export']['sql_type'] = 'insert';
 }