diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
| commit | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (patch) | |
| tree | 051a721f7ea77c2278d09323e36088abe22aa66a /sql/sql_update.cc | |
| parent | d11af09865299033d5eef64531704f6ab8af5304 (diff) | |
| parent | 2eb3c5e5420a724945a4cba914df25aa1e3744ce (diff) | |
| download | mariadb-git-9d2e2d753323a934604d25144b9d1ecaf34b47d8.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index a87261aa34b..e1d22e6a1e9 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -359,7 +359,7 @@ int mysql_update(THD *thd, table_list->grant.want_privilege= table->grant.want_privilege= (SELECT_ACL & ~table->grant.privilege); #endif - if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, 0)) + if (setup_fields(thd, 0, values, MARK_COLUMNS_READ, 0, NULL, 0)) { free_underlaid_joins(thd, select_lex); DBUG_RETURN(1); /* purecov: inspected */ @@ -1711,7 +1711,7 @@ int multi_update::prepare(List<Item> ¬_used_values, reference tables */ - int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, 0); + int error= setup_fields(thd, 0, *values, MARK_COLUMNS_READ, 0, NULL, 0); ti.rewind(); while ((table_ref= ti++)) |