diff options
| author | ingo@chilla.local <> | 2006-07-06 19:36:07 +0200 |
|---|---|---|
| committer | ingo@chilla.local <> | 2006-07-06 19:36:07 +0200 |
| commit | 591d461d957336b1fb7f4618a4fa6a91684e7fba (patch) | |
| tree | 32918d6b3b68267d9013a9f76bd6615f8ca0d86f /sql/sql_trigger.cc | |
| parent | 4eee50de1646695770f66901bf80484a14051d83 (diff) | |
| parent | 8728fbbc6ccf34b448b5cea1f00969fac54b58c6 (diff) | |
| download | mariadb-git-591d461d957336b1fb7f4618a4fa6a91684e7fba.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-bug16218
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 28d7dc0bb9d..2773dcb14ff 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -747,7 +747,8 @@ bool Table_triggers_list::prepare_record1_accessors(TABLE *table) QQ: it is supposed that it is ok to use this function for field cloning... */ - if (!(*old_fld= (*fld)->new_field(&table->mem_root, table))) + if (!(*old_fld= (*fld)->new_field(&table->mem_root, table, + table == (*fld)->table))) return 1; (*old_fld)->move_field((my_ptrdiff_t)(table->record[1] - table->record[0])); |