From: svoj
Date: December 30 2005 11:08am
Subject: bk commit into 5.1 tree (svoj:1.2011)
List-Archive: http://lists.mysql.com/commits/471
Message-Id: <20051230110801.19AF010D0@april.pils.ru>

Below is the list of changes that have just been committed into a local
5.1 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.2011 05/12/30 15:07:54 svoj@april.(none) +1 -0
  Merge svojtovich@stripped:/home/bk/mysql-5.1-new
  into  april.(none):/home/svoj/devel/mysql/mysql-5.1-new

  sql/mysqld.cc
    1.510 05/12/30 15:07:49 svoj@april.(none) +0 -0
    Auto merged

# 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:	april.(none)
# Root:	/home/svoj/devel/mysql/mysql-5.1-new/RESYNC

--- 1.509/sql/mysqld.cc	2005-12-29 14:02:03 +04:00
+++ 1.510/sql/mysqld.cc	2005-12-30 15:07:49 +04:00
@@ -7477,10 +7477,9 @@
   (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir
   (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home);
   (void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home);
-  strmake(opt_plugin_dir, get_relative_path(LIBDIR),
-          sizeof(opt_plugin_dir) - 1);
+  (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr :
+                                      get_relative_path(LIBDIR), mysql_home);
   opt_plugin_dir_ptr= opt_plugin_dir;
-  (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr, mysql_home);
 
   char *sharedir=get_relative_path(SHAREDIR);
   if (test_if_hard_path(sharedir))