Commit 51fd81ac authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents e30b5c78 eea6e15d

mysql-test/t/symlink.test

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ disable_query_log; 
show variables like "have_symlink";

enable_query_log;



--source include/not_windows.inc



--disable_warnings

drop table if exists t1,t2,t7,t8,t9;

drop database if exists mysqltest;

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -6358,7 +6358,7 @@ static void mysql_init_variables(void) 
#else

  have_openssl=SHOW_OPTION_NO;

#endif

#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)

#ifdef HAVE_BROKEN_REALPATH

  have_symlink=SHOW_OPTION_NO;

#else

  have_symlink=SHOW_OPTION_YES;
@@ -7053,7 +7053,7 @@ static void get_options(int argc,char **argv) 
    usage();

    exit(0);

  }

#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)

#if defined(HAVE_BROKEN_REALPATH)

  my_use_symdir=0;

  my_disable_symlinks=1;

  have_symlink=SHOW_OPTION_NO;