Commit 48d1dc74 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug10946


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
parents 88843709 837c9719

mysql-test/r/trigger.result

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ create trigger trg before insert on t1 for each row set @a:=1; 
create trigger trg after insert on t1 for each row set @a:=1;

ERROR HY000: Trigger already exists

create trigger trg2 before insert on t1 for each row set @a:=1;

ERROR HY000: Trigger already exists

ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'

create trigger trg before insert on t3 for each row set @a:=1;

ERROR HY000: Trigger already exists

create trigger trg2 before insert on t3 for each row set @a:=1;

mysql-test/t/trigger.test

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ create trigger trg before insert on t2 for each row set @a:=1; 
create trigger trg before insert on t1 for each row set @a:=1;

--error 1359

create trigger trg after insert on t1 for each row set @a:=1;

--error 1359

--error 1235

create trigger trg2 before insert on t1 for each row set @a:=1;

--error 1359

create trigger trg before insert on t3 for each row set @a:=1;

sql/sql_trigger.cc

+3 −1
Original line number Diff line number Diff line
@@ -375,7 +375,9 @@ 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])

  {

    my_message(ER_TRG_ALREADY_EXISTS, ER(ER_TRG_ALREADY_EXISTS), MYF(0));

    my_error(ER_NOT_SUPPORTED_YET, MYF(0),

             "multiple triggers with the same action time"

             " and event for one table");

    return 1;

  }