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

added missed configuration for INSERT IGNORE

Browse Source
This commit is contained in:
Michal Čihař
2004-03-10 12:59:01 +00:00
parent b6f8cbd8e5
commit 262462b03a
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -11,8 +11,10 @@ $Source$
libraries/dbi/mysqli.dbi.lib.php: Support for unbuffered queries - libraries/dbi/mysqli.dbi.lib.php: Support for unbuffered queries -
PMA_DBI_QUERY_UNBUFFERED and fix support of PMA_DBI_QUERY_STORE. PMA_DBI_QUERY_UNBUFFERED and fix support of PMA_DBI_QUERY_STORE.
* libraries/export/*.php: Use unbuffered queries (patch #890075). * libraries/export/*.php: Use unbuffered queries (patch #890075).
* libraries/export/sql.php, libraries/display_export.lib.php, lang/*: * libraries/export/sql.php, libraries/display_export.lib.php, lang/*,
Add support for INSERT IGNORE and UPDATE IGNORE. 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> 2004-03-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, libraries/display*, lang/*: * libraries/common.lib.php, libraries/display*, lang/*:

1
config.inc.php
View File

@@ -339,6 +339,7 @@ $cfg['Export']['sql_dates'] = FALSE;
$cfg['Export']['sql_relation'] = FALSE; $cfg['Export']['sql_relation'] = FALSE;
$cfg['Export']['sql_columns'] = FALSE; $cfg['Export']['sql_columns'] = FALSE;
$cfg['Export']['sql_delayed'] = FALSE; $cfg['Export']['sql_delayed'] = FALSE;
$cfg['Export']['sql_ignore'] = FALSE;
$cfg['Export']['sql_type'] = 'insert'; // insert/update/replace $cfg['Export']['sql_type'] = 'insert'; // insert/update/replace
$cfg['Export']['sql_extended'] = FALSE; $cfg['Export']['sql_extended'] = FALSE;
$cfg['Export']['sql_comments'] = FALSE; $cfg['Export']['sql_comments'] = FALSE;

2
libraries/common.lib.php
View File

@@ -136,7 +136,7 @@ if (isset($cfg['FileRevision'])) {
} else { } else {
$cfg['FileRevision'] = array(1, 1); $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'); require_once('./libraries/config_import.lib.php');
} }

3
libraries/config_import.lib.php
View File

@@ -1272,6 +1272,9 @@ if (!isset($cfg['Export']['sql_columns'])) {
if (!isset($cfg['Export']['sql_delayed'])) { if (!isset($cfg['Export']['sql_delayed'])) {
$cfg['Export']['sql_delayed'] = FALSE; $cfg['Export']['sql_delayed'] = FALSE;
} }
if (!isset($cfg['Export']['sql_ignore'])) {
$cfg['Export']['sql_ignore'] = FALSE;
}
if (!isset($cfg['Export']['sql_type'])) { if (!isset($cfg['Export']['sql_type'])) {
$cfg['Export']['sql_type'] = 'insert'; $cfg['Export']['sql_type'] = 'insert';
} }