diff options
| author | unknown <dlenev@mockturtle.local> | 2006-10-20 16:05:23 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-10-20 16:05:23 +0400 |
| commit | a6273e6d40c1ce2eda4c9d7f96ac12f86af89897 (patch) | |
| tree | 459e8ed5745da9331e0a6e923854e0ce01c34939 /sql/sql_trigger.cc | |
| parent | 5bd58f3e00ad7e7430c8d728f94209dce4c1a4e4 (diff) | |
| parent | 1a793de9e40179845b98454e9f1333464ef54e62 (diff) | |
| download | mariadb-git-a6273e6d40c1ce2eda4c9d7f96ac12f86af89897.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into mockturtle.local:/home/dlenev/src/mysql-5.0-bg15228-2
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index c0c9c34cbeb..421b2bb39a6 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -36,17 +36,17 @@ static File_option triggers_file_parameters[]= { { {(char *) STRING_WITH_LEN("triggers") }, - offsetof(class Table_triggers_list, definitions_list), + my_offsetof(class Table_triggers_list, definitions_list), FILE_OPTIONS_STRLIST }, { {(char *) STRING_WITH_LEN("sql_modes") }, - offsetof(class Table_triggers_list, definition_modes_list), + my_offsetof(class Table_triggers_list, definition_modes_list), FILE_OPTIONS_ULLLIST }, { {(char *) STRING_WITH_LEN("definers") }, - offsetof(class Table_triggers_list, definers_list), + my_offsetof(class Table_triggers_list, definers_list), FILE_OPTIONS_STRLIST }, { { 0, 0 }, 0, FILE_OPTIONS_STRING } @@ -55,7 +55,7 @@ static File_option triggers_file_parameters[]= File_option sql_modes_parameters= { {(char*) STRING_WITH_LEN("sql_modes") }, - offsetof(class Table_triggers_list, definition_modes_list), + my_offsetof(class Table_triggers_list, definition_modes_list), FILE_OPTIONS_ULLLIST }; |