bk commit into 5.0 tree (acurtis:1.1844)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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.1844 05/05/17 23:49:01 acurtis@stripped +1 -0
  fix embedded build

  sql/sql_acl.cc
    1.152 05/05/17 23:48:42 acurtis@stripped +4 -2
    style fix, long line.
    fix for embedded build which I broke

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/usr/home/antony/work2/p1-bug10246.1

--- 1.151/sql/sql_acl.cc	2005-05-17 09:50:40 +01:00
+++ 1.152/sql/sql_acl.cc	2005-05-17 23:48:42 +01:00
@@ -3650,7 +3650,8 @@
    1            error
 */
 
-bool check_routine_level_acl(THD *thd, const char *db, const char *name, bool is_proc)
+bool check_routine_level_acl(THD *thd, const char *db, const char *name, 
+                             bool is_proc)
 {
   bool no_routine_acl= 1;
   if (grant_option)
@@ -5662,7 +5663,8 @@
  Dummy wrappers when we don't have any access checks
 ****************************************************************************/
 
-bool check_routine_level_acl(THD *thd, const char *db, const char *name)
+bool check_routine_level_acl(THD *thd, const char *db, const char *name,
+                             bool is_proc)
 {
   return FALSE;
 }