diff options
| author | Ajo Robert <ajo.robert@oracle.com> | 2016-01-28 17:40:17 +0530 |
|---|---|---|
| committer | Ajo Robert <ajo.robert@oracle.com> | 2016-01-28 17:40:17 +0530 |
| commit | 01d41f68b7a6e6cc12565056661f1f28876beff5 (patch) | |
| tree | 566d1b0cc63742e0d42945c26c282c832c153f39 /sql/sql_load.cc | |
| parent | a4f2391d8dac3e1c65b269248e5b8a8045211897 (diff) | |
| download | mariadb-git-01d41f68b7a6e6cc12565056661f1f28876beff5.tar.gz | |
Bug #16912362 LOAD DATA INFILE CLAIMS TO BE HOLDING
'SYSTEM LOCK' IN PROCESSLIST
Analysis
=========
Show processlist shows 'System Lock' in 'State' field while
LOAD DATA INFILE is running.
thd->proc_info update is missing in LOAD DATA INFILE path.
Thus any request will get last unpdated status from lock_table()
during open_table().
Fix:
=======
Update state information from LOAD DATA INFILE path.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 5f72d3ce520..c084e5e3839 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -253,6 +253,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, { DBUG_RETURN(TRUE); } + thd_proc_info(thd, "executing"); /* Let us emit an error if we are loading data to table which is used in subselect in SET clause like we do it for INSERT. |