diff options
| author | unknown <ingo@chilla.local> | 2006-07-06 16:09:50 +0200 |
|---|---|---|
| committer | unknown <ingo@chilla.local> | 2006-07-06 16:09:50 +0200 |
| commit | a085d0988e89041cd7c1de252591d6dcad9bcb76 (patch) | |
| tree | ed465ab834004087658c163f87bfec1960814ae8 /sql/sql_trigger.cc | |
| parent | 9532056d1351f0377db90738363f5b4bff176588 (diff) | |
| parent | ab5ebc0fb7ce9e6af5bf3ac25425d518ee1a1050 (diff) | |
| download | mariadb-git-a085d0988e89041cd7c1de252591d6dcad9bcb76.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-bug16218
into chilla.local:/home/mydev/mysql-5.1-ateam
sql/field.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/field.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/table.cc:
Manual merge
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 0ea87f3dfe4..7c04d25ed82 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -733,7 +733,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_offset((my_ptrdiff_t)(table->record[1] - table->record[0])); |