diff options
| author | unknown <mskold@mysql.com> | 2004-12-06 14:34:02 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-12-06 14:34:02 +0100 |
| commit | 04866cf0f1c9341dff58e45c5063508f83e8aeb8 (patch) | |
| tree | 73beb404f63c7f8402b897e4b9a18058d872a26d /sql/sql_update.cc | |
| parent | 3af775dfd447bbf1d0cc65680e411622f9b99a64 (diff) | |
| download | mariadb-git-04866cf0f1c9341dff58e45c5063508f83e8aeb8.tar.gz | |
New fix for bug#6796 Wrong outcome of update operation of ndb table
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 37c048356cd..a52da469d9d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -110,8 +110,7 @@ int mysql_update(THD *thd, #ifndef NO_EMBEDDED_ACCESS_CHECKS table->grant.want_privilege=want_privilege; #endif - if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0) || - setup_fields(thd, 0, update_table_list, values, 1, 0, 0)) + if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0)) DBUG_RETURN(-1); /* purecov: inspected */ if (table->timestamp_field) { @@ -126,7 +125,7 @@ int mysql_update(THD *thd, /* Check values */ table->grant.want_privilege=(SELECT_ACL & ~table->grant.privilege); #endif - if (setup_fields(thd, 0, update_table_list, values, 0, 0, 0)) + if (setup_fields(thd, 0, update_table_list, values, 1, 0, 0)) { free_underlaid_joins(thd, &thd->lex->select_lex); DBUG_RETURN(-1); /* purecov: inspected */ |