summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorSachin Setiya <sachinsetia1001@gmail.com>2018-04-26 16:49:27 +0530
committersachin <sachin.setiya@maridb.com>2018-05-15 12:38:44 +0530
commit9ee5406e2f3ab338e15d23997039b2c95cc5762a (patch)
treee46753e7eaac433e853c4f9cad0591f7a03a6a90 /sql/sql_load.cc
parent46be31982a48e0456e9bee9918daf720c07be8b0 (diff)
downloadmariadb-git-9ee5406e2f3ab338e15d23997039b2c95cc5762a.tar.gz
MDEV-15965 Invisible columns and LOAD DATA don't work well together:... ER_WARN_TOO_FEW_RECORDS
Fix mysql_load iterator to skip invisible fields.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 3194ca5bcd9..cc5a5c7c794 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -444,6 +444,9 @@ int mysql_load(THD *thd, const sql_exchange *ex, TABLE_LIST *table_list,
field_iterator.set(table_list);
for (; !field_iterator.end_of_fields(); field_iterator.next())
{
+ if (field_iterator.field() &&
+ field_iterator.field()->invisible > VISIBLE)
+ continue;
Item *item;
if (!(item= field_iterator.create_item(thd)))
DBUG_RETURN(TRUE);