[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10832-ge1f019b

Marc Delisle lem9 at users.sourceforge.net
Wed Nov 10 11:51:11 CET 2010


The branch, master has been updated
       via  e1f019b2dc60b2e9a3b006163b0de6a1d7f5519f (commit)
      from  b43375b735f7ae2e29ea83a2ba5ef10d7b3fc639 (commit)


- Log -----------------------------------------------------------------
commit e1f019b2dc60b2e9a3b006163b0de6a1d7f5519f
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Nov 10 05:50:59 2010 -0500

    Clarify the option about INSERT IGNORE

-----------------------------------------------------------------------

Summary of changes:
 libraries/config/messages.inc.php |    4 ++--
 libraries/import/csv.php          |    2 +-
 libraries/import/ldi.php          |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 65545b7..437ca71 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -235,14 +235,14 @@ $strConfigImport_charset_name = __('Character set of the file');
 $strConfigImport_csv_col_names_name = __('Lines terminated by');
 $strConfigImport_csv_enclosed_name = __('Columns enclosed by');
 $strConfigImport_csv_escaped_name = __('Columns escaped by');
-$strConfigImport_csv_ignore_name = __('Ignore duplicate rows');
+$strConfigImport_csv_ignore_name = __('Do not abort on INSERT error');
 $strConfigImport_csv_replace_name = __('Replace table data with file');
 $strConfigImport_csv_terminated_name = __('Columns terminated by');
 $strConfigImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available');
 $strConfigImport_format_name = __('Format of imported file');
 $strConfigImport_ldi_enclosed_name = __('Columns enclosed by');
 $strConfigImport_ldi_escaped_name = __('Columns escaped by');
-$strConfigImport_ldi_ignore_name = __('Ignore duplicate rows');
+$strConfigImport_ldi_ignore_name = __('Do not abort on INSERT error');
 $strConfigImport_ldi_local_option_name = __('Use LOCAL keyword');
 $strConfigImport_ldi_replace_name = __('Replace table data with file');
 $strConfigImport_ldi_terminated_name = __('Columns terminated by');
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index b6e635b..db8d09c 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -23,7 +23,7 @@ if (isset($plugin_list)) {
         'options' => array(
             array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')),
-            array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')),
+            array('type' => 'bool', 'name' => 'ignore', 'text' => __('Do not abort on INSERT error')),
             array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns separated with:'), 'size' => 2, 'len' => 2),
             array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed with:'), 'size' => 2, 'len' => 2),
             array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped with:'), 'size' => 2, 'len' => 2),
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 39d42ed..e6eb56d 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -36,7 +36,7 @@ if (isset($plugin_list)) {
         'options' => array(
             array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')),
-            array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')),
+            array('type' => 'bool', 'name' => 'ignore', 'text' => __('Do not abort on INSERT error')),
             array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2),
             array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2),
             array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by'), 'size' => 2, 'len' => 2),


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list