From: antony
Date: May 14 2007 4:00pm
Subject: bk commit into 5.1 tree (acurtis:1.2515) BUG#25800
List-Archive: http://lists.mysql.com/commits/26625
X-Bug: 25800
Message-Id: <200705141600.l4EG0WtR025933@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-05-14 09:00:21-07:00, acurtis@stripped +1 -0
  Bug#25800
    "Embedded server requires mysql.plugin table"
    When building embedded library, we do not want/need the plugin_load() function
    which is used to load the mysql.plugin table.

  sql/sql_plugin.cc@stripped, 2007-05-14 09:00:16-07:00, acurtis@stripped +6 -0
    Bug#25800
      "Embedded server requires mysql.plugin table"
      When building embedded library, we do not want/need the plugin_load() function
      which is used to load the mysql.plugin table.

# 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:	ltamd64.mysql.com
# Root:	/home/antony/work2/mysql-5.1-embedded

--- 1.63/sql/sql_plugin.cc	2007-05-14 09:00:31 -07:00
+++ 1.64/sql/sql_plugin.cc	2007-05-14 09:00:31 -07:00
@@ -187,7 +187,9 @@
 
 
 /* prototypes */
+#ifndef EMBEDDED_LIBRARY
 static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv);
+#endif
 static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv,
                              const char *list);
 static int test_plugin_options(MEM_ROOT *, struct st_plugin_int *,
@@ -1169,8 +1171,10 @@
     if (opt_plugin_load &&
         plugin_load_list(&tmp_root, argc, argv, opt_plugin_load))
       goto err;
+#ifndef EMBEDDED_LIBRARY
     if (!(flags & PLUGIN_INIT_SKIP_PLUGIN_TABLE))
       plugin_load(&tmp_root, argc, argv);
+#endif
   }
 
   if (flags & PLUGIN_INIT_SKIP_INITIALIZATION)
@@ -1288,6 +1292,7 @@
 #endif /* NOT_USED_YET */
 
 
+#ifndef EMBEDDED_LIBRARY
 /*
   called only by plugin_init()
 */
@@ -1358,6 +1363,7 @@
   my_pthread_setspecific_ptr(THR_THD, 0);
   DBUG_VOID_RETURN;
 }
+#endif
 
 
 /*