Commit 50e3b321 authored by kroki/tomash@moonlight.intranet's avatar kroki/tomash@moonlight.intranet
Browse files

BUG#20637: "load data concurrent infile" locks the table 

Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).
parent 6fd6e099

sql/sql_yacc.yy

+2 −0
Original line number Diff line number Diff line
@@ -7031,6 +7031,8 @@ load_data_lock: 
              Ignore this option in SP to avoid problem with query cache

            */

            if (Lex->sphead != 0)

              $$= YYTHD->update_lock_default;

            else

#endif

              $$= TL_WRITE_CONCURRENT_INSERT;

          }