mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 configure.in: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged storage/innobase/btr/btr0cur.c: Auto merged storage/innobase/buf/buf0buf.c: Auto merged storage/innobase/include/rem0rec.h: Auto merged storage/innobase/include/rem0rec.ic: Auto merged storage/innobase/os/os0file.c: Auto merged storage/innobase/page/page0page.c: Auto merged storage/innobase/row/row0ins.c: Auto merged storage/innobase/trx/trx0rec.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged sql/sql_insert.cc: Auto merged
This commit is contained in:
@@ -2132,9 +2132,12 @@ bool select_insert::send_data(List<Item> &values)
|
||||
}
|
||||
if (!(error= write_record(thd, table, &info)))
|
||||
{
|
||||
if (table->triggers)
|
||||
if (table->triggers || info.handle_duplicates == DUP_UPDATE)
|
||||
{
|
||||
/*
|
||||
Restore fields of the record since it is possible that they were
|
||||
changed by ON DUPLICATE KEY UPDATE clause.
|
||||
|
||||
If triggers exist then whey can modify some fields which were not
|
||||
originally touched by INSERT ... SELECT, so we have to restore
|
||||
their original values for the next row.
|
||||
@@ -2387,11 +2390,11 @@ void select_create::abort()
|
||||
Instansiate templates
|
||||
*****************************************************************************/
|
||||
|
||||
#ifdef EXPLICIT_TEMPLATE_INSTANTIATION
|
||||
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
|
||||
template class List_iterator_fast<List_item>;
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
template class I_List<delayed_insert>;
|
||||
template class I_List_iterator<delayed_insert>;
|
||||
template class I_List<delayed_row>;
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
#endif /* EXPLICIT_TEMPLATE_INSTANTIATION */
|
||||
#endif /* HAVE_EXPLICIT_TEMPLATE_INSTANTIATION */
|
||||
|
Reference in New Issue
Block a user