summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-21 14:02:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-21 14:02:04 +0300
commit620ea816adeceaba7c875679ab8505f4c07a22b8 (patch)
treea52749e4f0c1fd07bc9f0c2a1159706a4e7789c3 /man
parenta1b6691f93e50ad4a8a53dbf89ba578d6a64b2cb (diff)
parentb4c225ac354686242b5336da84b7a758640936bd (diff)
downloadmariadb-git-620ea816adeceaba7c875679ab8505f4c07a22b8.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'man')
-rw-r--r--man/mysqlimport.126
1 files changed, 13 insertions, 13 deletions
diff --git a/man/mysqlimport.1 b/man/mysqlimport.1
index 98d68e956c5..16112399dab 100644
--- a/man/mysqlimport.1
+++ b/man/mysqlimport.1
@@ -57,13 +57,13 @@ all would be imported into a table named
patient\&.
.PP
.PP
-\fBmysqldump\fR
+\fBmysqlimport\fR
supports the following options, which can be specified on the command line or in the
-[mysqldump]
+[mysqlimport]
and
[client]
option file groups\&.
-\fBmysqldump\fR
+\fBmysqlimport\fR
also supports the options for processing option files\&.
.sp
.RS 4
@@ -267,17 +267,17 @@ Empty the table before importing the text file\&.
.sp -1
.IP \(bu 2.3
.\}
-.\" mysqldump: fields-terminated-by option
-.\" fields-terminated-by option: mysqldump
+.\" mysqlimport: fields-terminated-by option
+.\" fields-terminated-by option: mysqlimport
\fB\-\-fields\-terminated\-by=\&.\&.\&.\fR,
-.\" mysqldump: fields-enclosed-by option
-.\" fields-enclosed-by option: mysqldump
+.\" mysqlimport: fields-enclosed-by option
+.\" fields-enclosed-by option: mysqlimport
\fB\-\-fields\-enclosed\-by=\&.\&.\&.\fR,
-.\" mysqldump: fields-optionally-enclosed-by option
-.\" fields-optionally-enclosed-by option: mysqldump
+.\" mysqlimport: fields-optionally-enclosed-by option
+.\" fields-optionally-enclosed-by option: mysqlimport
\fB\-\-fields\-optionally\-enclosed\-by=\&.\&.\&.\fR,
-.\" mysqldump: fields-escaped-by option
-.\" fields-escaped-by option: mysqldump
+.\" mysqlimport: fields-escaped-by option
+.\" fields-escaped-by option: mysqlimport
\fB\-\-fields\-escaped\-by=\&.\&.\&.\fR
.sp
These options have the same meaning as the corresponding clauses for
@@ -379,8 +379,8 @@ lines of the data file\&.
.sp -1
.IP \(bu 2.3
.\}
-.\" mysqldump: lines-terminated-by option
-.\" lines-terminated-by option: mysqldump
+.\" mysqlimport: lines-terminated-by option
+.\" lines-terminated-by option: mysqlimport
\fB\-\-lines\-terminated\-by=\&.\&.\&.\fR
.sp
This option has the same meaning as the corresponding clause for