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".
This commit is contained in:
parent
329f6ba1cb
commit
06bc683652
@ -1109,17 +1109,9 @@ deallocate prepare stmt1;
|
|||||||
deallocate prepare stmt2;
|
deallocate prepare stmt2;
|
||||||
execute stmt;
|
execute stmt;
|
||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
|
||||||
t1 CREATE TABLE `t1` (
|
|
||||||
`c` char(10) default NULL
|
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
||||||
drop table t1;
|
drop table t1;
|
||||||
execute stmt;
|
execute stmt;
|
||||||
show create table t1;
|
show create table t1;
|
||||||
Table Create Table
|
|
||||||
t1 CREATE TABLE `t1` (
|
|
||||||
`c` char(10) default NULL
|
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
||||||
drop table t1;
|
drop table t1;
|
||||||
deallocate prepare stmt;
|
deallocate prepare stmt;
|
||||||
End of 4.1 tests.
|
End of 4.1 tests.
|
||||||
|
@ -1175,12 +1175,21 @@ deallocate prepare stmt2;
|
|||||||
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
|
eval prepare stmt from "create table t1 (c char(10)) data directory='$MYSQLTEST_VARDIR/tmp'";
|
||||||
--enable_query_log
|
--enable_query_log
|
||||||
execute stmt;
|
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;
|
show create table t1;
|
||||||
|
--enable_result_log
|
||||||
drop table t1;
|
drop table t1;
|
||||||
execute stmt;
|
execute stmt;
|
||||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
--disable_result_log
|
||||||
show create table t1;
|
show create table t1;
|
||||||
|
--enable_result_log
|
||||||
drop table t1;
|
drop table t1;
|
||||||
deallocate prepare stmt;
|
deallocate prepare stmt;
|
||||||
|
|
||||||
|
@ -67,12 +67,6 @@
|
|||||||
#define ONE_THREAD
|
#define ONE_THREAD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_purify
|
|
||||||
#define IF_PURIFY(A,B) (A)
|
|
||||||
#else
|
|
||||||
#define IF_PURIFY(A,B) (B)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if SIZEOF_CHARP == 4
|
#if SIZEOF_CHARP == 4
|
||||||
#define MAX_MEM_TABLE_SIZE ~(ulong) 0
|
#define MAX_MEM_TABLE_SIZE ~(ulong) 0
|
||||||
#else
|
#else
|
||||||
@ -5434,7 +5428,7 @@ log and this option does nothing anymore.",
|
|||||||
#endif
|
#endif
|
||||||
{"symbolic-links", 's', "Enable symbolic link support.",
|
{"symbolic-links", 's', "Enable symbolic link support.",
|
||||||
(gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,
|
(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,
|
{"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.",
|
"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,
|
(gptr*) &global_system_variables.sysdate_is_now,
|
||||||
@ -5466,7 +5460,7 @@ log and this option does nothing anymore.",
|
|||||||
0, 0, 0, 0, 0},
|
0, 0, 0, 0, 0},
|
||||||
{"use-symbolic-links", 's', "Enable symbolic link support. Deprecated option; use --symbolic-links instead.",
|
{"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,
|
(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,
|
{"user", 'u', "Run mysqld daemon as user.", 0, 0, 0, GET_STR, REQUIRED_ARG,
|
||||||
0, 0, 0, 0, 0, 0},
|
0, 0, 0, 0, 0, 0},
|
||||||
{"verbose", 'v', "Used with --help option for detailed help",
|
{"verbose", 'v', "Used with --help option for detailed help",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user