diff options
| author | kostja@bodhi.local <> | 2006-07-08 21:45:02 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-08 21:45:02 +0400 |
| commit | f1d949a856d04ced9b406572fa7d6d8bc4f0fff3 (patch) | |
| tree | b6199047edbf5520736ded4cb1c19af19d49a477 /sql/sql_trigger.cc | |
| parent | ff1947da1e9b5d5d8c739ff3c56be8cbadca37b5 (diff) | |
| parent | f631765a069063c6c475bed53176f2692283f70e (diff) | |
| download | mariadb-git-f1d949a856d04ced9b406572fa7d6d8bc4f0fff3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
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 55744631210..66a16f16d8c 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])); |