Merge

sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged

1 files changed, 21 insertions, 1 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 54977248890..f69f811383c 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -20506,7 +20506,8 @@ like you could do this, but that was a bug that has been corrected.
 @section @code{LOAD DATA INFILE} Syntax
 
 @example
-LOAD DATA [LOW_PRIORITY] [LOCAL] INFILE 'file_name.txt' [REPLACE | IGNORE]
+LOAD DATA [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE 'file_name.txt'
+    [REPLACE | IGNORE]
     INTO TABLE tbl_name
     [FIELDS
         [TERMINATED BY '\t']
@@ -20534,6 +20535,12 @@ If you specify the keyword @code{LOW_PRIORITY}, execution of the
 @code{LOAD DATA} statement is delayed until no other clients are reading
 from the table.
 
+If you specify the keyword @code{CONCURRENT} with a @code{MyISAM} table,
+then other threads can retrieve data from the table while @code{LOAD
+DATA} is executing. Using this option will of course affect the
+performance of @code{LOAD DATA} a bit even if no other thread is using
+the table at the same time.
+
 Using @code{LOCAL} will be a bit slower than letting the server access the
 files directly, because the contents of the file must travel from the client
 host to the server host.  On the other hand, you do not need the
@@ -36774,6 +36781,17 @@ thread that is waiting on the disk-full condition will allow the other
 threads to continue.
 @end itemize
 
+Exceptions to the above behaveour is when you use @code{REPAIR} or
+@code{OPTIMIZE} or when the indexes are created in a batch after an
+@code{LOAD DATA INFILE} or after an @code{ALTER TABLE} statement.
+
+All of the above commands may use big temporary files that left to
+themself would cause big problems for the rest of the system.  If
+@strong{MySQL} gets disk full while doing any of the above operations,
+it will remove the big temporary files and mark the table as crashed
+(except for @code{ALTER TABLE}, in which the old table will be left
+unchanged).
+
 @node Multiple sql commands, Temporary files, Full disk, Problems
 @section How to Run SQL Commands from a Text File
 
@@ -44084,6 +44102,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.38
 @itemize @bullet
 @item
+Added option @code{CONCURRENT} to @code{LOAD DATA}.
+@item
 Better error message when slave @code{max_allowed_packet} is to low to
 read a very long log event from the master
 @item