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 /mysql-test/t/ps.test | |
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 'mysql-test/t/ps.test')
-rw-r--r-- | mysql-test/t/ps.test | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index bddf6f57ed1..5f00aa60b11 100644 --- a/mysql-test/t/ps.test +++ b/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; |