bk commit into 5.0-fulltext tree (svoj:1.2019)

[svoj]

Below is the list of changes that have just been committed into a local
5.0-fulltext repository of svoj. When svoj 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.2019 05/10/26 17:45:16 svoj@stripped +2 -0
  WL#2575 - Fulltext: Parser plugin for FTS
  plugin-dir renamed to plugin_dir.
  Fixed that plugin_dir was empty string in SHOW VARIABLES.
  Fixed wrong default plugin_dir.

  sql/set_var.cc
    1.144 05/10/26 17:45:07 svoj@stripped +1 -1
    Fixed that plugin_dir was empty variable in SHOW VARIABLES.

  sql/mysqld.cc
    1.508 05/10/26 17:45:06 svoj@stripped +2 -2
    plugin-dir renamed to plugin_dir.
    By default opt_plugin_dir is pkglibdir now, instead of get_relative_path(pkglibdir).

# 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:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/CNET/mysql-5.0

--- 1.507/sql/mysqld.cc	2005-09-28 14:50:28 +05:00
+++ 1.508/sql/mysqld.cc	2005-10-26 17:45:06 +05:00
@@ -5563,7 +5563,7 @@
    (gptr*) &global_system_variables.optimizer_search_depth,
    (gptr*) &max_system_variables.optimizer_search_depth,
    0, GET_ULONG, OPT_ARG, MAX_TABLES+1, 0, MAX_TABLES+2, 0, 1, 0},
-  {"plugin-dir", OPT_PLUGIN_DIR,
+  {"plugin_dir", OPT_PLUGIN_DIR,
    "Directory for plugins.",
    (gptr*) &opt_plugin_dir, (gptr*) &opt_plugin_dir, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
@@ -6140,7 +6140,7 @@
 	  sizeof(mysql_real_data_home)-1);
   mysql_data_home_buff[0]=FN_CURLIB;	// all paths are relative from here
   mysql_data_home_buff[1]=0;
-  opt_plugin_dir= get_relative_path(LIBDIR);
+  opt_plugin_dir= (char *)LIBDIR;
 
   /* Replication parameters */
   master_user= (char*) "test";

--- 1.143/sql/set_var.cc	2005-09-28 14:50:29 +05:00
+++ 1.144/sql/set_var.cc	2005-10-26 17:45:07 +05:00
@@ -929,7 +929,7 @@
   {sys_optimizer_search_depth.name,(char*) &sys_optimizer_search_depth,
    SHOW_SYS},
   {"pid_file",                (char*) pidfile_name,                 SHOW_CHAR},
-  {"plugin_dir",              (char*) opt_plugin_dir,               SHOW_CHAR},
+  {"plugin_dir",              (char*) &opt_plugin_dir,              SHOW_CHAR_PTR},
   {"port",                    (char*) &mysqld_port,                  SHOW_INT},
   {sys_preload_buff_size.name, (char*) &sys_preload_buff_size,      SHOW_SYS},
   {"protocol_version",        (char*) &protocol_version,            SHOW_INT},