bk commit into 5.0 tree (monty:1.1914)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1914 05/07/28 23:57:56 monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/my/mysql-5.0

  sql/sql_trigger.cc
    1.24 05/07/28 23:57:51 monty@stripped +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.44 05/07/28 23:57:51 monty@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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.23/sql/sql_trigger.cc	2005-07-27 14:17:00 +03:00
+++ 1.24/sql/sql_trigger.cc	2005-07-28 23:57:51 +03:00
@@ -565,8 +565,7 @@
               alloc_root(&table->mem_root, triggers->sroutines_key.length)))
         DBUG_RETURN(1);
       triggers->sroutines_key.str[0]= TYPE_ENUM_TRIGGER;
-      strmov(strmov(strmov(triggers->sroutines_key.str+1, db), "."),
-             table_name);
+      strxmov(triggers->sroutines_key.str+1, db, ".", table_name, NullS);
 
       /*
         TODO: This could be avoided if there is no triggers

--- 1.43/mysql-test/t/variables.test	2005-07-23 02:18:28 +03:00
+++ 1.44/mysql-test/t/variables.test	2005-07-28 23:57:51 +03:00
@@ -390,6 +390,8 @@
 SHOW VARIABLES LIKE 'table_cache';
 SET GLOBAL table_cache=DEFAULT;
 
+# End of 4.1 tests
+
 #
 # Bug#6282 Packet error with SELECT INTO
 #