diff options
| author | unknown <kroki@mysql.com> | 2006-06-28 23:54:18 +0400 |
|---|---|---|
| committer | unknown <kroki@mysql.com> | 2006-06-28 23:54:18 +0400 |
| commit | 48d1dc7417bbe26cbc3733aa401b06b88d524604 (patch) | |
| tree | ac329416869abcbf9c30af5b173b13cc6bda51d8 /sql/sql_trigger.cc | |
| parent | 88843709d8d2bb07794f3c13084bf33e5dea8662 (diff) | |
| parent | 837c9719c436faa083872fda118891c94bbc3403 (diff) | |
| download | mariadb-git-48d1dc7417bbe26cbc3733aa401b06b88d524604.tar.gz | |
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
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 1cbd4dcd198..28d7dc0bb9d 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -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; } |