diff options
| author | unknown <kostja@bodhi.local> | 2006-07-08 21:45:02 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-08 21:45:02 +0400 |
| commit | cad24c097ebc348c1dcb1dd888a0fb89a3844cde (patch) | |
| tree | b6199047edbf5520736ded4cb1c19af19d49a477 /sql/sql_trigger.cc | |
| parent | e1f3149c1685a9e186d67bc2f8024570ab1edb48 (diff) | |
| parent | e6f010b63eb9d846810bff75352fa9aa5424426f (diff) | |
| download | mariadb-git-cad24c097ebc348c1dcb1dd888a0fb89a3844cde.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
myisam/mi_create.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/federated.result:
Manual merge.
mysql-test/t/federated.test:
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 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])); |