bk commit into 5.0 tree (kroki:1.2205) BUG#10946

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2205 06/06/27 17:07:33 kroki@stripped +3 -0
  Bug#10946: Confusing error messeges in the case of duplicate trigger definition
  
  Error message changed to
  
  ERROR 42000: This version of MySQL doesn't yet support 'Multiple triggers with the same activation time'

  sql/sql_trigger.cc
    1.50 06/06/27 17:07:26 kroki@stripped +2 -1
    If there is already a trigger with the same activation time, report an
    "Unsupported yet" error.

  mysql-test/t/trigger.test
    1.47 06/06/27 17:07:25 kroki@stripped +1 -1
    Update test for new error code.

  mysql-test/r/trigger.result
    1.42 06/06/27 17:07:25 kroki@stripped +1 -1
    Update result for new error message.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-bug10946

--- 1.41/mysql-test/r/trigger.result	2006-06-16 20:21:21 +04:00
+++ 1.42/mysql-test/r/trigger.result	2006-06-27 17:07:25 +04:00
@@ -295,7 +295,7 @@
 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 activation time'
 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;

--- 1.46/mysql-test/t/trigger.test	2006-06-16 20:21:21 +04:00
+++ 1.47/mysql-test/t/trigger.test	2006-06-27 17:07:25 +04:00
@@ -321,7 +321,7 @@
 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;

--- 1.49/sql/sql_trigger.cc	2006-03-28 01:01:48 +04:00
+++ 1.50/sql/sql_trigger.cc	2006-06-27 17:07:26 +04:00
@@ -366,7 +366,8 @@
   /* 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 activation time");
     return 1;
   }