From 27a600dba8c84c4bfcae064fea05ea569e9991c8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 12 Sep 2006 17:15:14 +0000
Subject: [PATCH] bug #1556934, SQL compatibility mode on export

---
 ChangeLog                    | 4 ++++
 libraries/config.default.php | 2 +-
 libraries/export/sql.php     | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9405f0192..0fbcd9b6a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-09-12 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/config.default.php, libraries/export/sql.php:
+      bug #1556934, sql compatibility mode on export
+
 2006-09-08 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/check_lang.sh: ignore differences in doc_lang
     * lang/italian: Update, thanks to Rebe - rebeluca.
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 864faa561..c524ad97b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -310,7 +310,7 @@ $cfg['Export']['latex_structure_label']     = 'tab:__TABLE__-structure';
 
 $cfg['Export']['sql_structure']             = TRUE;
 $cfg['Export']['sql_data']                  = TRUE;
-$cfg['Export']['sql_compat']                = 'NONE';
+$cfg['Export']['sql_compatibility']         = 'NONE';
 $cfg['Export']['sql_disable_fk']            = FALSE;
 $cfg['Export']['sql_use_transaction']       = FALSE;
 $cfg['Export']['sql_drop_database']         = FALSE;
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index dad6efa96..9389e696d 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -175,8 +175,8 @@ function PMA_exportHeader()
     global $crlf;
     global $cfg;
 
-    if (PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compat']) && $GLOBALS['sql_compat'] != 'NONE') {
-        PMA_DBI_try_query('SET SQL_MODE="' . $GLOBALS['sql_compat'] . '"');
+    if (PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] != 'NONE') {
+        PMA_DBI_try_query('SET SQL_MODE="' . $GLOBALS['sql_compatibility'] . '"');
     }
 
     $head  =  $GLOBALS['comment_marker'] . 'phpMyAdmin SQL Dump' . $crlf
@@ -241,7 +241,7 @@ function PMA_exportDBCreate($db)
     if (!PMA_exportOutputHandler($create_query)) {
         return FALSE;
     }
-    if (isset($GLOBALS['sql_backquotes']) && PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compat']) && $GLOBALS['sql_compat'] == 'NONE') {
+    if (isset($GLOBALS['sql_backquotes']) && PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') {
         return PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
     }
     return PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);