diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
| commit | 9b1336fec9072cab46ab237c0f94c85808b52be4 (patch) | |
| tree | 5ce45a92708629c661c7e1815428098713fb496c /sql/sql_trigger.cc | |
| parent | f8d8b3db916d71697a6d5f00eba4f0da6f522959 (diff) | |
| parent | e0aeba21a5b58038d38c92f750c1684ccb2a72d4 (diff) | |
| download | mariadb-git-9b1336fec9072cab46ab237c0f94c85808b52be4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
sql/item_create.cc:
manual merge
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index e835de4dedd..8ca72eab8bf 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -362,7 +362,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, TABLE *table= tables->table; char file_buff[FN_REFLEN], trigname_buff[FN_REFLEN]; LEX_STRING file, trigname_file; - LEX_STRING *trg_def, *name; + LEX_STRING *trg_def; LEX_STRING definer_user; LEX_STRING definer_host; ulonglong *trg_sql_mode; @@ -877,7 +877,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, DBUG_RETURN(1); List_iterator_fast<LEX_STRING> it(triggers->definitions_list); - LEX_STRING *trg_create_str, *trg_name_str; + LEX_STRING *trg_create_str; ulonglong *trg_sql_mode; if (triggers->definition_modes_list.is_empty() && @@ -994,7 +994,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, goto err_with_lex_cleanup; } - lex.sphead->set_info(0, 0, &lex.sp_chistics, *trg_sql_mode); + lex.sphead->set_info(0, 0, &lex.sp_chistics, (ulong) *trg_sql_mode); triggers->bodies[lex.trg_chistics.event] [lex.trg_chistics.action_time]= lex.sphead; @@ -1335,7 +1335,6 @@ Table_triggers_list::change_table_name_in_triggers(THD *thd, { char path_buff[FN_REFLEN]; LEX_STRING *def, *on_table_name, new_def; - ulonglong *sql_mode; ulong save_sql_mode= thd->variables.sql_mode; List_iterator_fast<LEX_STRING> it_def(definitions_list); List_iterator_fast<LEX_STRING> it_on_table_name(on_table_names_list); @@ -1349,7 +1348,7 @@ Table_triggers_list::change_table_name_in_triggers(THD *thd, while ((def= it_def++)) { on_table_name= it_on_table_name++; - thd->variables.sql_mode= *(it_mode++); + thd->variables.sql_mode= (ulong) *(it_mode++); /* Construct CREATE TRIGGER statement with new table name. */ buff.length(0); |