mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1

Browse source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-04-26 13:59:57 +02:00
commit 86cd5c7603
6 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/include/have_symlink.inc Normal file
View file

@ -0,0 +1,10 @@
# 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;

11
mysql-test/t/partition_mgm_err2.test
View file

@ -1,18 +1,13 @@
#
# 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
#

1
mysql-test/t/partition_not_windows-master.opt Normal file
View file

@ -0,0 +1 @@
--symbolic-links=1

8
mysql-test/t/partition_not_windows.test
View file

@ -1,11 +1,11 @@
# 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

6
mysql-test/t/symlink.test
View file

@ -1,8 +1,4 @@
-- 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

10
sql/mysqld.cc
View file

@ -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},