bk commit into 5.1 tree (kent:1.1954)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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
  1.1954 05/12/12 16:12:36 kent@stripped +3 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

  sql/mysqld.cc
    1.501 05/12/12 16:12:29 kent@stripped +0 -0
    Auto merged

  scripts/make_win_src_distribution.sh
    1.44 05/12/12 16:12:29 kent@stripped +0 -0
    Auto merged

  mysql-test/t/symlink.test
    1.17 05/12/12 16:12:29 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new/RESYNC

--- 1.500/sql/mysqld.cc	2005-12-06 20:07:27 +01:00
+++ 1.501/sql/mysqld.cc	2005-12-12 16:12:29 +01:00
@@ -6469,7 +6469,7 @@
 #else
   have_openssl=SHOW_OPTION_NO;
 #endif
-#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
+#ifdef HAVE_BROKEN_REALPATH
   have_symlink=SHOW_OPTION_NO;
 #else
   have_symlink=SHOW_OPTION_YES;
@@ -7165,7 +7165,7 @@
     usage();
     exit(0);
   }
-#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
+#if defined(HAVE_BROKEN_REALPATH)
   my_use_symdir=0;
   my_disable_symlinks=1;
   have_symlink=SHOW_OPTION_NO;

--- 1.43/scripts/make_win_src_distribution.sh	2005-11-04 21:09:53 +01:00
+++ 1.44/scripts/make_win_src_distribution.sh	2005-12-12 16:12:29 +01:00
@@ -199,7 +199,7 @@
        print_debug "Creating directory '$arg'"
        mkdir $BASE/$arg
      fi
-    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \
+    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \
              README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
              *.inc *.test *.result *.pem Moscow_leap des_key_file \
              *.vcproj *.sln *.dat *.000001 *.require *.opt
@@ -342,7 +342,7 @@
 #
 # Search the tree for plain text files and adapt the line end marker
 #
-find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \
+find $BASE \( -name "*.cnf" -o -name "*.ini" \
            -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \
            -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \
            -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \

--- 1.16/mysql-test/t/symlink.test	2005-07-28 15:12:37 +02:00
+++ 1.17/mysql-test/t/symlink.test	2005-12-12 16:12:29 +01:00
@@ -3,6 +3,8 @@
 show variables like "have_symlink";
 enable_query_log;
 
+--source include/not_windows.inc
+
 --disable_warnings
 drop table if exists t1,t2,t7,t8,t9;
 drop database if exists mysqltest;