mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1 BitKeeper/etc/logging_ok: auto-union include/mysql.h: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_pkg.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -5358,6 +5358,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
|
||||
{
|
||||
Item *item= *group->item;
|
||||
item->save_org_in_field(group->field);
|
||||
#ifdef EMBEDDED_LIBRARY
|
||||
join->thd->net.last_errno= 0;
|
||||
#endif
|
||||
/* Store in the used key if the field was 0 */
|
||||
if (item->maybe_null)
|
||||
group->buff[-1]=item->null_value ? 1 : 0;
|
||||
|
Reference in New Issue
Block a user