diff options
| author | Chad MILLER <chad@mysql.com> | 2008-12-17 15:01:34 -0500 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-12-17 15:01:34 -0500 |
| commit | 926e5f6694d1bb1dd5b8074efd526fd8983b620f (patch) | |
| tree | 14bfefa872195990d45ab8f3ee850730cd31ed1b /sql/sql_trigger.cc | |
| parent | 27d35e3517a063c9259a0f8b9638bf3073cf020b (diff) | |
| parent | 4d1a042df0c52fd7c721313ec84d39e2b2c0a2f6 (diff) | |
| download | mariadb-git-926e5f6694d1bb1dd5b8074efd526fd8983b620f.tar.gz | |
Merged from 5.0 (enterprise).
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 1737bb0d9f8..d3b5289cd68 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -479,7 +479,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, trigname.trigger_table.length= tables->table_name_length; if (sql_create_definition_file(&dir, &trigname_file, &trigname_file_type, - (gptr)&trigname, trigname_file_parameters, 0)) + (gptr)&trigname, trigname_file_parameters)) return 1; /* @@ -569,7 +569,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, /* Create trigger definition file. */ if (!sql_create_definition_file(&dir, &file, &triggers_file_type, - (gptr)this, triggers_file_parameters, 0)) + (gptr)this, triggers_file_parameters)) return 0; err_with_cleanup: @@ -656,7 +656,7 @@ static bool save_trigger_file(Table_triggers_list *triggers, const char *db, file.str= file_buff; return sql_create_definition_file(&dir, &file, &triggers_file_type, - (gptr)triggers, triggers_file_parameters, 0); + (gptr)triggers, triggers_file_parameters); } @@ -968,11 +968,13 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, thd->variables.sql_mode= (ulong)*trg_sql_mode; - Lex_input_stream lip(thd, trg_create_str->str, trg_create_str->length); - thd->m_lip= &lip; + Parser_state parser_state(thd, trg_create_str->str, + trg_create_str->length); + thd->m_parser_state= &parser_state; lex_start(thd); thd->spcont= NULL; int err= MYSQLparse((void *)thd); + thd->m_parser_state= NULL; if (err || thd->is_fatal_error) { @@ -1425,7 +1427,7 @@ Table_triggers_list::change_table_name_in_trignames(const char *db_name, trigname.trigger_table= *new_table_name; if (sql_create_definition_file(&dir, &trigname_file, &trigname_file_type, - (gptr)&trigname, trigname_file_parameters, 0)) + (gptr)&trigname, trigname_file_parameters)) return trigger; } |