diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-08 10:54:54 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-08 10:54:54 +0200 |
| commit | 619d8b2c6500b4d213d7d2f1d8cb0df9bce145a5 (patch) | |
| tree | d9a03e26a9b3e468f84781258b965941aa4c6e90 /sql/sql_trigger.cc | |
| parent | d0baba61141c6581f661459636c29b90c4f66eac (diff) | |
| parent | 4298f45d01f24fecff23c599336df838aedc454e (diff) | |
| download | mariadb-git-619d8b2c6500b4d213d7d2f1d8cb0df9bce145a5.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1--main
into chilla.local:/home/mydev/mysql-5.1-amerge
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
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 d1b3e72796d..5abdfa27d58 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])); |