diff options
| author | unknown <cmiller@calliope.local> | 2007-02-12 14:39:42 -0500 |
|---|---|---|
| committer | unknown <cmiller@calliope.local> | 2007-02-12 14:39:42 -0500 |
| commit | 7d1fefeaf51f9c8b965a8312fdf4a0c62b73abab (patch) | |
| tree | 5bf83d9877b576a892973455e59335dbfd49e56c /sql/sql_trigger.cc | |
| parent | c4fdf11e583f4837e8d649875ff11338d7d3172e (diff) | |
| parent | 48b461a4867925cdb42cb249c278cd8c7804ed0d (diff) | |
| download | mariadb-git-7d1fefeaf51f9c8b965a8312fdf4a0c62b73abab.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
sql/sql_trigger.cc:
Auto merged
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index df363c3c21c..6869d02a782 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -340,7 +340,7 @@ end: tables - table list containing one open table for which the trigger is created. stmt_query - [OUT] after successful return, this string contains - well-formed statement for creation this trigger. + well-formed statement for creating this trigger. NOTE - Assumes that trigger name is fully qualified. @@ -380,7 +380,7 @@ bool Table_triggers_list::create_trigger(THD *thd, TABLE_LIST *tables, } /* We don't allow creation of several triggers of the same type yet */ - if (bodies[lex->trg_chistics.event][lex->trg_chistics.action_time]) + if (bodies[lex->trg_chistics.event][lex->trg_chistics.action_time] != 0) { my_error(ER_NOT_SUPPORTED_YET, MYF(0), "multiple triggers with the same action time" @@ -673,7 +673,7 @@ static bool save_trigger_file(Table_triggers_list *triggers, const char *db, tables - table list containing one open table for which trigger is dropped. stmt_query - [OUT] after successful return, this string contains - well-formed statement for creation this trigger. + well-formed statement for deleting this trigger. RETURN VALUE False - success |