diff options
| author | unknown <kostja@bodhi.local> | 2007-01-17 14:24:54 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-01-17 14:24:54 +0300 |
| commit | 41a9400b8b775eaa70abfdd70862ad0eb3bcf587 (patch) | |
| tree | cc23bba66e3b13b9536bb7325bc74bbfbff3d4fc /sql | |
| parent | fa1826939f33835032ede04ff6c86eb6aa0f4fd0 (diff) | |
| download | mariadb-git-41a9400b8b775eaa70abfdd70862ad0eb3bcf587.tar.gz | |
Fix a ps.test failure in 5.0-runtime tree.
mysql-test/r/ps.result:
Update result files.
mysql-test/t/ps.test:
Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
may be present or absent from the output depending on the build
otpions and the operating system, so the output is not consistent
across supported platforms.
sql/mysqld.cc:
Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
added in 2002: DEBUG options should not influence server functionality.
This backfired by producing different output of SHOW CREATE TABLE
depending on the build options (see also Bug#25677 "With
--skip-symbolic-links option on, DATA DIRECTORY clause
is silently ignored".
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b59962a5005..dbca7dae338 100644 --- a/sql/mysqld.cc +++ b/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", |