diff options
author | monty@tik.mysql.fi <> | 2001-08-02 06:29:50 +0300 |
---|---|---|
committer | monty@tik.mysql.fi <> | 2001-08-02 06:29:50 +0300 |
commit | b13d453d50c47b647c868b9dcb425133eb58c776 (patch) | |
tree | fc9655d17169cd0d2593f7a2e888de91cd33dfe8 /sql/sql_update.cc | |
parent | 423f2851c57a253166d4e98cc71dc5177632ca10 (diff) | |
download | mariadb-git-b13d453d50c47b647c868b9dcb425133eb58c776.tar.gz |
Fix UNION
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
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 609c2642bc6..113995b169c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -90,7 +90,7 @@ int mysql_update(THD *thd, /* Check the fields we are going to modify */ table->grant.want_privilege=want_privilege; - if (setup_fields(thd,table_list,fields,1,0)) + if (setup_fields(thd,table_list,fields,1,0,0)) DBUG_RETURN(-1); /* purecov: inspected */ if (table->timestamp_field) { @@ -103,7 +103,7 @@ int mysql_update(THD *thd, /* Check values */ table->grant.want_privilege=(SELECT_ACL & ~table->grant.privilege); - if (setup_fields(thd,table_list,values,0,0)) + if (setup_fields(thd,table_list,values,0,0,0)) { table->time_stamp=save_time_stamp; // Restore timestamp pointer DBUG_RETURN(-1); /* purecov: inspected */ |