diff options
| author | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
|---|---|---|
| committer | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
| commit | 6b4a1d3c307d40dc5f59baaff0662fc8d10c01c8 (patch) | |
| tree | 1cd9471bfb066e2ed5fdc557a5948b95230098ec /sql/mysqld.cc | |
| parent | 3cf73f2786bb8f12b7ede7419fbfe39896c5e8cf (diff) | |
| parent | 41d23a044d80509cb12c26bc152967c8bcf14ab6 (diff) | |
| download | mariadb-git-6b4a1d3c307d40dc5f59baaff0662fc8d10c01c8.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/drop.result:
SCCS merged
mysql-test/t/drop.test:
SCCS merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 16c65f48708..36a5b1a10d9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8344,7 +8344,7 @@ static void fix_paths(void) (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); (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr : - get_relative_path(LIBDIR), mysql_home); + get_relative_path(PLUGINDIR), mysql_home); opt_plugin_dir_ptr= opt_plugin_dir; char *sharedir=get_relative_path(SHAREDIR); |