bk commit into 5.1 tree (jani:1.2579)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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@stripped, 2007-04-13 14:04:57+03:00, jani@stripped +2 -0
  Avoid resetting a variable. Fixed grant.test.

  mysql-test/r/grant.result@stripped, 2007-04-13 14:04:54+03:00, jani@stripped +1 -0
    Avoid resetting a variable. Fixed grant.test.

  mysql-test/t/grant.test@stripped, 2007-04-13 14:04:54+03:00, jani@stripped +2 -0
    Avoid resetting a variable. Fixed grant.test.

# 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:	jani
# Host:	a88-113-38-195.elisa-laajakaista.fi
# Root:	/home/my/new/mysql-5.1-marvel

--- 1.70/mysql-test/r/grant.result	2007-04-13 12:47:39 +03:00
+++ 1.71/mysql-test/r/grant.result	2007-04-13 14:04:54 +03:00
@@ -1,3 +1,4 @@
+SET GLOBAL log_bin_trust_function_creators = 1;
 drop table if exists t1;
 drop database if exists mysqltest;
 SET NAMES binary;

--- 1.53/mysql-test/t/grant.test	2007-04-13 09:25:34 +03:00
+++ 1.54/mysql-test/t/grant.test	2007-04-13 14:04:54 +03:00
@@ -3,6 +3,8 @@
 # Grant tests not performed with embedded server
 -- source include/not_embedded.inc
 
+SET GLOBAL log_bin_trust_function_creators = 1;
+
 # Cleanup
 --disable_warnings
 drop table if exists t1;