diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | include/Makefile.am | 6 | ||||
| -rw-r--r-- | mysql-test/std_data/init_file.dat | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql/ha_ndbcluster.cc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql/ha_ndbcluster.h | 0 |
6 files changed, 8 insertions, 6 deletions
diff --git a/.bzrignore b/.bzrignore index 98d0f5c4bba..f87851d3e77 100644 --- a/.bzrignore +++ b/.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 diff --git a/configure.in b/configure.in index 94ad5a47991..94e0ea0aad2 100644 --- a/configure.in +++ b/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 diff --git a/include/Makefile.am b/include/Makefile.am index 3adbb31f235..8f71298bbcf 100644 --- a/include/Makefile.am +++ b/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 diff --git a/mysql-test/std_data/init_file.dat b/mysql-test/std_data/init_file.dat index 4236ada1142..6105ca2ac1b 100644 --- a/mysql-test/std_data/init_file.dat +++ b/mysql-test/std_data/init_file.dat @@ -1 +1 @@ -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; diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 3bc322878d1..3bc322878d1 100755..100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index ed66d07d79b..ed66d07d79b 100755..100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h |