Commit 667cb179 authored by msvensson@pilot.blaudden's avatar msvensson@pilot.blaudden

Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
parents 9f1aac76 c6f625bd
# Several partition-related tests include this file, because Valgrind/Purify
# builds disable symlink support; some partition functionality depends on
# symlink support, and so does not test correctly under valgrind. See the
# comment in mysqld.cc for the --symbolic-links option.
-- require r/have_symlink.require
disable_query_log;
show variables like "have_symlink";
enable_query_log;
#
# Test of partitions that require symlinks
#
-- source include/have_partition.inc
--source include/have_partition.inc
--source include/have_symlink.inc
#
# This test is disabled on windows due to BUG#19107
#
-- source include/not_windows.inc
-- require r/have_symlink.require
disable_query_log;
show variables like "have_symlink";
enable_query_log;
--source include/not_windows.inc
#
# BUG: 14354 Partitions: data directory clause fails
#
......
# Non-windows specific partition tests.
--source include/not_windows.inc
--source include/have_partition.inc
# DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
--source include/have_symlink.inc
# partition.test used to contained the following note:
# This test is disabled on Windows due to BUG#19107
# All tests passed on Windows except the following which should be moved into
# partition.test once the bug has been resolved.
# The test for Bug 20770 is disabled on Windows due to BUG#19107; it
# should be moved into partition.test once the bug has been resolved.
#
# Bug 20770 Partitions: DATA DIRECTORY clause change in reorganize
......
-- require r/have_symlink.require
disable_query_log;
show variables like "have_symlink";
enable_query_log;
--source include/have_symlink.inc
--source include/not_windows.inc
--disable_warnings
......
......@@ -5872,6 +5872,11 @@ 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,
/*
The system call realpath() produces warnings under valgrind and
purify. These are not suppressed: instead we disable symlinks
option if compiled with valgrind support.
*/
IF_PURIFY(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.",
......@@ -5904,11 +5909,6 @@ 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,
/*
The system call realpath() produces warnings under valgrind and
purify. These are not suppressed: instead we disable symlinks
option if compiled with valgrind support.
*/
IF_PURIFY(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},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment