diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-27 07:05:16 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-27 07:05:16 +0400 |
| commit | f462bfc1f786cccf132b09cb9553d75f2191f629 (patch) | |
| tree | 3821f7cdd34c1b58fc4761cbdb577ca8c9e61fc2 /sql/sql_load.cc | |
| parent | 9bc32256427373e5bfa78f17c5854ac4e6a2fc31 (diff) | |
| download | mariadb-git-f462bfc1f786cccf132b09cb9553d75f2191f629.tar.gz | |
A post-merge fix: loadxml failed on Windows (due to a wrong parameter to my_error).
Fixing to pass item->name.str rather than item->name to my_error().
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 82fea4f07fa..132da4dff65 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1087,7 +1087,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, } else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else @@ -1126,7 +1126,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, } else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else @@ -1166,7 +1166,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, } else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else @@ -1306,7 +1306,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, ((Item_user_var_as_out_param *) item)->set_null_value(cs); else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else @@ -1336,7 +1336,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, tag->value.length(), cs); else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else @@ -1373,7 +1373,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, ((Item_user_var_as_out_param *)item)->set_null_value(cs); else if (!real_item) { - my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name); + my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name.str); DBUG_RETURN(1); } else |