Commit 7d1fefea authored by unknown's avatar unknown
Browse files

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
parents c4fdf11e 48b461a4

sql/sql_trigger.cc

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) 
      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