diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-07 09:14:09 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-07 09:14:09 +0200 |
| commit | 4298f45d01f24fecff23c599336df838aedc454e (patch) | |
| tree | 8ae7181a81317ca6ba34bdfa32bb2f33936d91bd /sql/sql_trigger.cc | |
| parent | 16c54768ba01d9138043ffa8b426b5d3bd14931b (diff) | |
| parent | 6e791bb1262b7f4312dce54bfe419c638cc230b8 (diff) | |
| download | mariadb-git-4298f45d01f24fecff23c599336df838aedc454e.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1--main
into chilla.local:/home/mydev/mysql-5.1-amerge
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])); |