diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
| commit | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (patch) | |
| tree | 9e2bc4700a2db961d967e53f00c941f3ee501173 /sql/sql_trigger.cc | |
| parent | cfa0c6ff1d8f7268f895d79daf94e7d29197327d (diff) | |
| parent | ff3da0f963b28d128005da8ca5d0c93a72d34b27 (diff) | |
| download | mariadb-git-869f5d0e81d5cbecaec3605f292fbb363b9ccbf6.tar.gz | |
Merge with alias as String
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index e32bedd80a0..1c4add27e57 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -802,7 +802,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, stmt_query->append(stmt_definition.str, stmt_definition.length); - trg_def->str= stmt_query->c_ptr(); + trg_def->str= stmt_query->c_ptr_safe(); trg_def->length= stmt_query->length(); /* Create trigger definition file. */ @@ -1039,10 +1039,7 @@ void Table_triggers_list::set_table(TABLE *new_table) { trigger_table= new_table; for (Field **field= new_table->triggers->record1_field ; *field ; field++) - { - (*field)->table= (*field)->orig_table= new_table; - (*field)->table_name= &new_table->alias; - } + (*field)->init(new_table); } |