bk commit into 5.0 tree (jimw:1.2207)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.2207 06/06/28 10:55:27 jimw@stripped +1 -0
  Merge bk-internal:/home/bk/mysql-5.0-runtime
  into  mysql.com:/home/jimw/my/mysql-5.0-18005

  sql/sql_trigger.cc
    1.51 06/06/28 10:55:23 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-18005/RESYNC

--- 1.50/sql/sql_trigger.cc	2006-06-26 13:47:47 -07:00
+++ 1.51/sql/sql_trigger.cc	2006-06-28 10:55:23 -07:00
@@ -183,6 +183,15 @@ bool mysql_create_or_drop_trigger(THD *t
       !(tables= add_table_for_trigger(thd, thd->lex->spname)))
     DBUG_RETURN(TRUE);
 
+  /*
+    We don't allow creating triggers on tables in the 'mysql' schema
+  */
+  if (create && !my_strcasecmp(system_charset_info, "mysql", tables->db))
+  {
+    my_error(ER_NO_TRIGGERS_ON_SYSTEM_SCHEMA, MYF(0));
+    DBUG_RETURN(TRUE);
+  }
+
   /* We should have only one table in table list. */
   DBUG_ASSERT(tables->next_global == 0);