nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1556934, SQL compatibility mode on export

Browse Source
This commit is contained in:
Marc Delisle
2006-09-12 17:15:14 +00:00
parent 34268655e9
commit 27a600dba8
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $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> 2006-09-08 Marc Delisle <lem9@users.sourceforge.net>
* lang/check_lang.sh: ignore differences in doc_lang * lang/check_lang.sh: ignore differences in doc_lang
* lang/italian: Update, thanks to Rebe - rebeluca. * lang/italian: Update, thanks to Rebe - rebeluca.

2
libraries/config.default.php
View File

@@ -310,7 +310,7 @@ $cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
$cfg['Export']['sql_structure'] = TRUE; $cfg['Export']['sql_structure'] = TRUE;
$cfg['Export']['sql_data'] = 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_disable_fk'] = FALSE;
$cfg['Export']['sql_use_transaction'] = FALSE; $cfg['Export']['sql_use_transaction'] = FALSE;
$cfg['Export']['sql_drop_database'] = FALSE; $cfg['Export']['sql_drop_database'] = FALSE;

6
libraries/export/sql.php
View File

@@ -175,8 +175,8 @@ function PMA_exportHeader()
global $crlf; global $crlf;
global $cfg; global $cfg;
if (PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compat']) && $GLOBALS['sql_compat'] != 'NONE') { if (PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] != 'NONE') {
PMA_DBI_try_query('SET SQL_MODE="' . $GLOBALS['sql_compat'] . '"'); PMA_DBI_try_query('SET SQL_MODE="' . $GLOBALS['sql_compatibility'] . '"');
} }
$head = $GLOBALS['comment_marker'] . 'phpMyAdmin SQL Dump' . $crlf $head = $GLOBALS['comment_marker'] . 'phpMyAdmin SQL Dump' . $crlf
@@ -241,7 +241,7 @@ function PMA_exportDBCreate($db)
if (!PMA_exportOutputHandler($create_query)) { if (!PMA_exportOutputHandler($create_query)) {
return FALSE; 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 ' . PMA_backquote($db) . ';' . $crlf);
} }
return PMA_exportOutputHandler('USE ' . $db . ';' . $crlf); return PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);