diff options
| author | unknown <knielsen@mysql.com> | 2005-12-21 16:05:13 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2005-12-21 16:05:13 +0100 |
| commit | b479c27f440cefd679498286d9c904efd647805c (patch) | |
| tree | 8a267759a15bd83bfea6cc508e8c64f68b508125 /sql/sql_trigger.cc | |
| parent | 9ae226fe41576390b48141205619223eb4cdde4b (diff) | |
| parent | 3e3b21504bf247c801bf3a8564aac50f94bc3a6d (diff) | |
| download | mariadb-git-b479c27f440cefd679498286d9c904efd647805c.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/local/mysql/mysql-5.0
sql/sql_trigger.cc:
Auto merged
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 13b79821a58..8a26c2bafa2 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -21,7 +21,7 @@ #include "parse_file.h" static const LEX_STRING triggers_file_type= - {STRING_WITH_LEN("TRIGGERS")}; + {(char *) STRING_WITH_LEN("TRIGGERS")}; const char * const triggers_file_ext= ".TRG"; @@ -34,17 +34,17 @@ const char * const triggers_file_ext= ".TRG"; static File_option triggers_file_parameters[]= { { - {STRING_WITH_LEN("triggers") }, + {(char *) STRING_WITH_LEN("triggers") }, offsetof(class Table_triggers_list, definitions_list), FILE_OPTIONS_STRLIST }, { - {STRING_WITH_LEN("sql_modes") }, + {(char *) STRING_WITH_LEN("sql_modes") }, offsetof(class Table_triggers_list, definition_modes_list), FILE_OPTIONS_ULLLIST }, { - {STRING_WITH_LEN("definers") }, + {(char *) STRING_WITH_LEN("definers") }, offsetof(class Table_triggers_list, definers_list), FILE_OPTIONS_STRLIST }, @@ -71,14 +71,14 @@ struct st_trigname }; static const LEX_STRING trigname_file_type= - {STRING_WITH_LEN("TRIGGERNAME")}; + {(char *) STRING_WITH_LEN("TRIGGERNAME")}; const char * const trigname_file_ext= ".TRN"; static File_option trigname_file_parameters[]= { { - {STRING_WITH_LEN("trigger_table")}, + {(char *) STRING_WITH_LEN("trigger_table")}, offsetof(struct st_trigname, trigger_table), FILE_OPTIONS_ESTRING }, @@ -1243,7 +1243,7 @@ Handle_old_incorrect_sql_modes_hook::process_unknown_string(char *&unknown_key, (char *)path, "TRIGGER"); File_option sql_modes_parameters= { - {STRING_WITH_LEN("sql_modes") }, + {(char *) STRING_WITH_LEN("sql_modes") }, offsetof(class Table_triggers_list, definition_modes_list), FILE_OPTIONS_ULLLIST }; |