diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-18 15:14:39 +0200 |
| commit | da4503e956ee067947e504c6e73052d9d906742c (patch) | |
| tree | a70bbc33f0411ef29c347a570d8253445d8013e4 /sql/sql_update.cc | |
| parent | babbf8c6fc6da92cd1b2bb23f04e996f84b0ca1a (diff) | |
| parent | b000e169562697aa072600695d4f0c0412f94f4f (diff) | |
| download | mariadb-git-da4503e956ee067947e504c6e73052d9d906742c.tar.gz | |
Merge branch '5.5' into 10.0
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 9ca96bd702e..4dc190ab8cb 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -358,7 +358,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 */ @@ -1682,7 +1682,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++)) |