1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New fix for bug#6796 Wrong outcome of update operation of ndb table

Browse Source
This commit is contained in:
unknown 2004-12-06 14:34:02 +01:00
parent 3af775dfd4
commit 04866cf0f1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_update.cc
View File

@ -110,8 +110,7 @@ int mysql_update(THD *thd,
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
table->grant.want_privilege=want_privilege; table->grant.want_privilege=want_privilege;
#endif #endif
if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0) || if (setup_fields(thd, 0, update_table_list, fields, 1, 0, 0))
setup_fields(thd, 0, update_table_list, values, 1, 0, 0))
DBUG_RETURN(-1); /* purecov: inspected */ DBUG_RETURN(-1); /* purecov: inspected */
if (table->timestamp_field) if (table->timestamp_field)
{ {
@ -126,7 +125,7 @@ int mysql_update(THD *thd,
/* Check values */ /* Check values */
table->grant.want_privilege=(SELECT_ACL & ~table->grant.privilege); table->grant.want_privilege=(SELECT_ACL & ~table->grant.privilege);
#endif #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); free_underlaid_joins(thd, &thd->lex->select_lex);
DBUG_RETURN(-1); /* purecov: inspected */ DBUG_RETURN(-1); /* purecov: inspected */