Fix a ps.test failure in 5.0-runtime tree.

mysql-test/r/ps.result

@@ -1109,17 +1109,9 @@ deallocate prepare stmt1;
 deallocate prepare stmt2;
 execute stmt;
 show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `c` char(10) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 execute stmt;
 show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `c` char(10) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 deallocate prepare stmt;
 End of 4.1 tests.

mysql-test/t/ps.test

@@ -1175,12 +1175,21 @@ deallocate prepare stmt2;
 eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
 --enable_query_log
 execute stmt;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+#
+# DATA DIRECTORY option does not always work: if the operating
+# system does not support symlinks, have_symlinks option is automatically
+# disabled.
+# In this case DATA DIRECTORY is silently ignored when
+# creating a table, and is not output by SHOW CREATE TABLE.
+#
+--disable_result_log
 show create table t1;
+--enable_result_log
 drop table t1;
 execute stmt;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--disable_result_log
 show create table t1;
+--enable_result_log
 drop table t1;
 deallocate prepare stmt;
 

sql/mysqld.cc

@@ -67,12 +67,6 @@
 #define ONE_THREAD
 #endif
 
-#ifdef HAVE_purify
-#define IF_PURIFY(A,B) (A)
-#else
-#define IF_PURIFY(A,B) (B)
-#endif
-
 #if SIZEOF_CHARP == 4
 #define MAX_MEM_TABLE_SIZE ~(ulong) 0
 #else
@@ -5434,7 +5428,7 @@ log and this option does nothing anymore.",
 #endif
   {"symbolic-links", 's', "Enable symbolic link support.",
    (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,
-   IF_PURIFY(0,1), 0, 0, 0, 0, 0},
+   1, 0, 0, 0, 0, 0},
   {"sysdate-is-now", OPT_SYSDATE_IS_NOW,
    "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' value different for different invocations, even within the same statement.",
    (gptr*) &global_system_variables.sysdate_is_now,
@@ -5466,7 +5460,7 @@ log and this option does nothing anymore.",
    0, 0, 0, 0, 0},
   {"use-symbolic-links", 's', "Enable symbolic link support. Deprecated option; use --symbolic-links instead.",
    (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,
-   IF_PURIFY(0,1), 0, 0, 0, 0, 0},
+   1, 0, 0, 0, 0, 0},
   {"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Used with --help option for detailed help",