mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Huge pull
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Auto merged BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Auto merged include/mysql.h: Auto merged include/violite.h: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/lib_vio.c: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -5288,6 +5288,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