diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 15:25:55 +0200 |
| commit | b069d19284b70ead3ceb62618acdc8ef93a2703e (patch) | |
| tree | 0d5f6764825d51db3b8a37c8043d837c06e3e086 /sql/sql_load.cc | |
| parent | 1bc0b0b5245977172e2c3a3c64a42a2c4e762e06 (diff) | |
| parent | e7061f7e5a96c66cb2e0bf46bec7f6ff35801a69 (diff) | |
| download | mariadb-git-b069d19284b70ead3ceb62618acdc8ef93a2703e.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 75ddf80ea66..fba6dcf9ac0 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2010, 2016, MariaDB 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 @@ -255,6 +255,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. |