diff options
| author | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2002-10-18 15:55:21 +0500 |
| commit | a62ee2202f86c47f6a8d6d05948e181d73d56ba1 (patch) | |
| tree | e1ac6531db331ae24b2dcfca9ab05c0a35f3fc92 /sql/sql_select.cc | |
| parent | 4ae5fd0b892748925b3899131adc2c192453f693 (diff) | |
| parent | 4c4c31db7b34082901fb976371914f9d5e8c952f (diff) | |
| download | mariadb-git-a62ee2202f86c47f6a8d6d05948e181d73d56ba1.tar.gz | |
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
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6a48f56443c..84ffa9c6663 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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; |