symlink, not hardlink

mkdir in Makefile, not in configure
chmod a-x


sql/ha_ndbcluster.cc:
  Change mode to -rw-rw-r--
sql/ha_ndbcluster.h:
  Change mode to -rw-rw-r--
BitKeeper/etc/ignore:
  added libmysqld/discover.cc
configure.in:
  symlink, not hardlink
  mkdir in Makefile, not in configure
include/Makefile.am:
  mkdir in Makefile, not in configure
mysql-test/std_data/init_file.dat:
  add EOL
  make a test faster

.bzrignore

@@ -772,3 +772,4 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
 ndb/lib/libREP_API.so
 ndb/lib/libndbclient.so
 ndb/lib/libndbclient_extra.so
+libmysqld/discover.cc

configure.in

@@ -2228,7 +2228,6 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
     # For NetWare, do not need readline
     echo "Skipping readline"
 else
-mkdir include/readline
 
 if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
 then
@@ -2236,7 +2235,7 @@ then
     readline_basedir="libedit"
     readline_dir="$readline_topdir/$readline_basedir"
     readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a"
-    readline_h_ln_cmd="\$(LN) \$(top_builddir)/cmd-line-utils/libedit/readline/*.h readline/"
+    readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline/*.h readline/"
     compile_libedit=yes
     AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE)
 elif test "$with_readline" = "yes"
@@ -2245,7 +2244,7 @@ then
     readline_basedir="readline"
     readline_dir="$readline_topdir/$readline_basedir"
     readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
-    readline_h_ln_cmd="\$(LN) \$(top_builddir)/cmd-line-utils/readline/*.h readline/"
+    readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline/*.h readline/"
     compile_readline=yes
     AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE)
 else

include/Makefile.am

@@ -48,14 +48,16 @@ all-local:		my_config.h
 # Since we include my_config.h it better exist from the beginning
 link_sources:
 	$(CP) ../config.h my_config.h
-	$(RM) -f readline/*
+	$(RM) -fr readline/*
+	-mkdir readline
 	@readline_h_ln_cmd@
 
 # Keep automake happy 
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h
-	$(RM) -f readline/*
+	$(RM) -fr readline/*
+	-mkdir readline
 	@readline_h_ln_cmd@
 
 # These files should not be included in distributions since they are

mysql-test/std_data/init_file.dat

-select * from mysql.user as t1, mysql.user as t2, mysql.user as t3, mysql.user as t4, mysql.user as t5, mysql.user as t6, mysql.user as t7, mysql.user as t8;
\ No newline at end of file
+select * from mysql.user as t1, mysql.user as t2, mysql.user as t3;