From: Date: September 27 2005 9:36pm
Subject: bk commit into 4.1 tree (dlenev:1.2457) BUG#13501
List-Archive: http://lists.mysql.com/internals/30403
X-Bug: 13501
Message-Id: <20050927193609.63E4D12FEDC@brandersnatch.site>

Below is the list of changes that have just been committed into a local
4.1 repository of dlenev. When dlenev 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.2457 05/09/27 23:36:02 dlenev@stripped +1 -0
  Fix for bug #13501 "build problem: too many arguments to function my_bool
  acl_init".
  
  Updated calls to acl_init()/grant_init() in init_embedded_server() - their
  signatures were changed recently, now they don't need argument for passing
  pointer to THD object (this code was only compiled if one built embedded
  server library with --with-embedded-privilege-control switch).

  libmysqld/lib_sql.cc
    1.125 05/09/27 23:35:58 dlenev@stripped +2 -2
    acl_init/grant_init() are now used only at server start up so they always
    allocate temporary THD object and don't need argument for passing pointer
    to it.

# 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:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-4.1-bg13501

--- 1.124/libmysqld/lib_sql.cc	2005-08-04 13:06:37 +04:00
+++ 1.125/libmysqld/lib_sql.cc	2005-09-27 23:35:58 +04:00
@@ -427,9 +427,9 @@
 
   acl_error= 0;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&
+  if (!(acl_error= acl_init(opt_noacl)) &&
       !opt_noacl)
-    (void) grant_init((THD *)0);
+    (void) grant_init();
 #endif
   if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
   {