bk commit into 5.1 tree (tsmith:1.2481)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-25 20:21:55+02:00, tsmith@stripped +5 -0
  Fix for valgrind errors in test: require symlink support for partition_not_windows.test

  mysql-test/include/have_symlink.inc@stripped, 2007-04-25 20:18:53+02:00, tsmith@stripped +10 -0
    BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc

  mysql-test/include/have_symlink.inc@stripped, 2007-04-25 20:18:53+02:00, tsmith@stripped +0 -0

  mysql-test/t/partition_mgm_err2.test@stripped, 2007-04-25 20:21:22+02:00, tsmith@stripped +3 -8
    Fix for valgrind errors in test: require symlink support for partition_not_windows.test

  mysql-test/t/partition_not_windows.test@stripped, 2007-04-25 20:21:22+02:00, tsmith@stripped +2 -0
    Fix for valgrind errors in test: require symlink support for partition_not_windows.test

  mysql-test/t/symlink.test@stripped, 2007-04-25 20:21:22+02:00, tsmith@stripped +1 -5
    Fix for valgrind errors in test: require symlink support for partition_not_windows.test

  sql/mysqld.cc@stripped, 2007-04-25 20:21:22+02:00, tsmith@stripped +5 -5
    Fix for valgrind errors in test: require symlink support for partition_not_windows.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

--- 1.636/sql/mysqld.cc	2007-04-24 11:21:39 +02:00
+++ 1.637/sql/mysqld.cc	2007-04-25 20:21:22 +02:00
@@ -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},

--- 1.1/mysql-test/t/partition_not_windows.test	2007-04-23 19:50:32 +02:00
+++ 1.2/mysql-test/t/partition_not_windows.test	2007-04-25 20:21:22 +02:00
@@ -1,6 +1,8 @@
 # Non-windows specific partition tests.
 --source include/not_windows.inc
 --source include/have_partition.inc
+# SUBPARTITION depends on symlink support
+--source include/have_symlink.inc
 
 # partition.test used to contained the following note:
 # This test is disabled on Windows due to BUG#19107

--- 1.26/mysql-test/t/symlink.test	2007-02-01 19:16:59 +01:00
+++ 1.27/mysql-test/t/symlink.test	2007-04-25 20:21:22 +02:00
@@ -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

--- 1.4/mysql-test/t/partition_mgm_err2.test	2006-09-01 08:12:28 +02:00
+++ 1.5/mysql-test/t/partition_mgm_err2.test	2007-04-25 20:21:22 +02:00
@@ -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
 #
--- New file ---
+++ mysql-test/include/have_symlink.inc	07/04/25 20:18:53
# 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;