bk commit into 5.2 tree (msvensson:1.2102)

[msvensson]

Below is the list of changes that have just been committed into a local
5.2 repository of msvensson. When msvensson 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.2102 06/02/14 11:01:19 msvensson@neptunus.(none) +9 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.2

  sql/sql_yacc.yy
    1.459 06/02/14 11:01:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.78 06/02/14 11:01:12 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/sql_trigger.cc
    1.48 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/handler.cc
    1.216 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.258 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.130 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.160 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/lib/mtr_process.pl
    1.28 06/02/14 11:01:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  configure.in
    1.337 06/02/14 11:01:10 msvensson@neptunus.(none) +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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.2/RESYNC

--- 1.47/sql/sql_trigger.cc	2006-02-09 16:32:55 +01:00
+++ 1.48/sql/sql_trigger.cc	2006-02-14 11:01:11 +01:00
@@ -195,10 +195,8 @@
   /*
     There is no DETERMINISTIC clause for triggers, so can't check it.
     But a trigger can in theory be used to do nasty things (if it supported
-    DROP for example) so we do the check for privileges. For now there is
-    already a stronger test right above; but when this stronger test will
-    be removed, the test below will hold. Because triggers have the same
-    nature as functions regarding binlogging: their body is implicitely
+    DROP for example) so we do the check for privileges. Triggers have the
+    same nature as functions regarding binlogging: their body is implicitely
     binlogged, so they share the same danger, so trust_function_creators
     applies to them too.
   */