bk commit into 5.1 tree (antony:1.2547) BUG#25800

[antony]

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-06-12 10:22:36-07:00, antony@stripped +1 -0
  bug#25800
    "Embedded server requires mysql.plugin"
    Omit error message for missing mysql.plugin table when compiling
    for embedded library

  sql/sql_plugin.cc@stripped, 2007-06-12 10:22:33-07:00, antony@stripped +2 -0
    bug25800
      Omit error message for missing mysql.plugin table when compiling
      for embedded library

# 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:	antony
# Host:	ppcg5.local
# Root:	/Users/antony/Work/p2-bug25800.5

--- 1.67/sql/sql_plugin.cc	2007-06-12 10:22:47 -07:00
+++ 1.68/sql/sql_plugin.cc	2007-06-12 10:22:47 -07:00
@@ -1318,8 +1318,10 @@ static void plugin_load(MEM_ROOT *tmp_ro
   if (simple_open_n_lock_tables(new_thd, &tables))
   {
     DBUG_PRINT("error",("Can't open plugin table"));
+#ifndef EMBEDDED_LIBRARY
     sql_print_error("Can't open the mysql.plugin table. Please "
                     "run mysql_upgrade to create it.");
+#endif /* EMBEDDED_LIBRARY */
     goto end;
   }
   table= tables.table;