Commit e68ff466 authored by Michael Widenius's avatar Michael Widenius

Fixed compiler and gmake warnings

- Removed SCCS rule from Makefile.am
- Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
Don't use maintainer mode with valgrind (as we don't want to initialize all variables)

config/ac-macros/maintainer.m4:
  Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
  Force initialization of variables when using -Werror (To get rid of compiler warnings)
configure.in:
  Don't use maintainer mode with valgrind (as we don't want to initialize all variables)
sql/sql_yacc.yy:
  Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
parent 9ab4829b
...@@ -32,6 +32,3 @@ noinst_HEADERS = readline.h chardefs.h keymaps.h \ ...@@ -32,6 +32,3 @@ noinst_HEADERS = readline.h chardefs.h keymaps.h \
EXTRA_DIST= emacs_keymap.c vi_keymap.c EXTRA_DIST= emacs_keymap.c vi_keymap.c
DEFS = -DMYSQL_CLIENT_NO_THREADS -DHAVE_CONFIG_H -DNO_KILL_INTR -D_GNU_SOURCE=1 DEFS = -DMYSQL_CLIENT_NO_THREADS -DHAVE_CONFIG_H -DNO_KILL_INTR -D_GNU_SOURCE=1
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -8,7 +8,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ ...@@ -8,7 +8,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
[AS_HELP_STRING([--enable-mysql-maintainer-mode], [AS_HELP_STRING([--enable-mysql-maintainer-mode],
[Enable a MySQL maintainer-specific development environment])], [Enable a MySQL maintainer-specific development environment])],
[USE_MYSQL_MAINTAINER_MODE=$enableval], [USE_MYSQL_MAINTAINER_MODE=$enableval],
[AS_IF([test "$with_debug" != "no"], [AS_IF([test "$with_debug" != "no" -a "$with_valgrind" = "no"],
[USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])]) [USE_MYSQL_MAINTAINER_MODE=yes], [USE_MYSQL_MAINTAINER_MODE=no])])
AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE]) AC_MSG_RESULT([$USE_MYSQL_MAINTAINER_MODE])
]) ])
...@@ -17,7 +17,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [ ...@@ -17,7 +17,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [ AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
# Setup GCC warning options. # Setup GCC warning options.
AS_IF([test "$GCC" = "yes"], [ AS_IF([test "$GCC" = "yes"], [
C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror" C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror -DFORCE_INIT_OF_VARS"
CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter" CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
]) ])
......
...@@ -111,6 +111,17 @@ AC_ARG_WITH([debug], ...@@ -111,6 +111,17 @@ AC_ARG_WITH([debug],
[with_debug=$withval], [with_debug=$withval],
[with_debug=no]) [with_debug=no])
AC_ARG_WITH([valgrind],
[AS_HELP_STRING([--with-valgrind],
[Valgrind instrumentation @<:@default=no@:>@])],
[], [with_valgrind=no])
if test "$with_valgrind" != "no"
then
AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
[AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
fi
# Whether the maintainer mode should be enabled. # Whether the maintainer mode should be enabled.
MY_MAINTAINER_MODE MY_MAINTAINER_MODE
...@@ -1728,17 +1739,6 @@ else ...@@ -1728,17 +1739,6 @@ else
CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
fi fi
AC_ARG_WITH([valgrind],
[AS_HELP_STRING([--with-valgrind],
[Valgrind instrumentation @<:@default=no@:>@])],
[], [with_valgrind=no])
if test "$with_valgrind" != "no"
then
AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
[AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
fi
# Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it. # Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it.
AC_MSG_CHECKING(if Debug Sync Facility should be enabled.) AC_MSG_CHECKING(if Debug Sync Facility should be enabled.)
AC_ARG_ENABLE(debug_sync, AC_ARG_ENABLE(debug_sync,
......
SUBDIRS = taocrypt src testsuite SUBDIRS = taocrypt src testsuite
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -6,7 +6,3 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ ...@@ -6,7 +6,3 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX @yassl_thread_cxxflags@ AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX @yassl_thread_cxxflags@
# Don't update the files from bitkeeper
%::SCCS/s.%
SUBDIRS = src test benchmark SUBDIRS = src test benchmark
EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp) EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -4,6 +4,3 @@ benchmark_SOURCES = benchmark.cpp ...@@ -4,6 +4,3 @@ benchmark_SOURCES = benchmark.cpp
benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
benchmark_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@ benchmark_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@
EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -12,7 +12,3 @@ libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C \ ...@@ -12,7 +12,3 @@ libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C \
@yassl_thread_cxxflags@ @yassl_thread_cxxflags@
EXTRA_DIST = $(wildcard ../include/*.hpp) EXTRA_DIST = $(wildcard ../include/*.hpp)
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -4,6 +4,3 @@ test_SOURCES = test.cpp ...@@ -4,6 +4,3 @@ test_SOURCES = test.cpp
test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
test_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@ test_CXXFLAGS = -DYASSL_PURE_C @yassl_thread_cxxflags@
EXTRA_DIST = make.bat EXTRA_DIST = make.bat
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -8,7 +8,3 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER @yassl_threa ...@@ -8,7 +8,3 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER @yassl_threa
testsuite_LDADD = $(top_builddir)/extra/yassl/src/libyassl.la \ testsuite_LDADD = $(top_builddir)/extra/yassl/src/libyassl.la \
$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -115,6 +115,3 @@ conf_to_src_LDADD= ...@@ -115,6 +115,3 @@ conf_to_src_LDADD=
#force static linking of conf_to_src - essential when linking against #force static linking of conf_to_src - essential when linking against
#custom installation of libc #custom installation of libc
conf_to_src_LDFLAGS=@NOINST_LDFLAGS@ conf_to_src_LDFLAGS=@NOINST_LDFLAGS@
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -52,6 +52,3 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) ...@@ -52,6 +52,3 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK = $(CXXLINK) mysql_client_test_embedded_LINK = $(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -23,7 +23,3 @@ my_safe_process_SOURCES = safe_process.cc ...@@ -23,7 +23,3 @@ my_safe_process_SOURCES = safe_process.cc
EXTRA_DIST = safe_kill_win.cc \ EXTRA_DIST = safe_kill_win.cc \
safe_process_win.cc \ safe_process_win.cc \
CMakeLists.txt CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -34,6 +34,3 @@ EXTRA_LIBRARIES = libdaemon_example.a ...@@ -34,6 +34,3 @@ EXTRA_LIBRARIES = libdaemon_example.a
noinst_LIBRARIES = @plugin_daemon_example_static_target@ noinst_LIBRARIES = @plugin_daemon_example_static_target@
libdaemon_example_a_CXXFLAGS = $(AM_CXXFLAGS) libdaemon_example_a_CXXFLAGS = $(AM_CXXFLAGS)
libdaemon_example_a_SOURCES= daemon_example.cc libdaemon_example_a_SOURCES= daemon_example.cc
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -22,6 +22,3 @@ pkgplugin_LTLIBRARIES= mypluglib.la ...@@ -22,6 +22,3 @@ pkgplugin_LTLIBRARIES= mypluglib.la
mypluglib_la_SOURCES= plugin_example.c mypluglib_la_SOURCES= plugin_example.c
mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN mypluglib_la_CFLAGS= -shared -DMYSQL_DYNAMIC_PLUGIN
# Don't update the files from bitkeeper
%::SCCS/s.%
noinst_HEADERS = aout64.h stab.def stab_gnu.h noinst_HEADERS = aout64.h stab.def stab_gnu.h
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -98,6 +98,3 @@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ ...@@ -98,6 +98,3 @@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
tags: tags:
ctags -R *.h *.cc ctags -R *.h *.cc
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -57,6 +57,3 @@ distclean-local: ...@@ -57,6 +57,3 @@ distclean-local:
# Do nothing # Do nothing
link_sources: link_sources:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -1268,6 +1268,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -1268,6 +1268,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token YEAR_SYM /* SQL-2003-R */ %token YEAR_SYM /* SQL-2003-R */
%token ZEROFILL %token ZEROFILL
%token IMPOSSIBLE_ACTION /* To avoid warning for yyerrlab1 */
%left JOIN_SYM INNER_SYM STRAIGHT_JOIN CROSS LEFT RIGHT %left JOIN_SYM INNER_SYM STRAIGHT_JOIN CROSS LEFT RIGHT
/* A dummy token to force the priority of table_ref production in a join. */ /* A dummy token to force the priority of table_ref production in a join. */
%left TABLE_REF_PRIORITY %left TABLE_REF_PRIORITY
...@@ -1466,6 +1468,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -1466,6 +1468,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
init_key_options normal_key_options normal_key_opts all_key_opt init_key_options normal_key_options normal_key_opts all_key_opt
spatial_key_options fulltext_key_options normal_key_opt spatial_key_options fulltext_key_options normal_key_opt
fulltext_key_opt spatial_key_opt fulltext_key_opts spatial_key_opts fulltext_key_opt spatial_key_opt fulltext_key_opts spatial_key_opts
keep_gcc_happy
key_using_alg key_using_alg
server_def server_options_list server_option server_def server_options_list server_option
definer_opt no_definer definer definer_opt no_definer definer
...@@ -1595,11 +1598,12 @@ statement: ...@@ -1595,11 +1598,12 @@ statement:
| help | help
| insert | insert
| install | install
| keep_gcc_happy
| keycache
| kill | kill
| load | load
| lock | lock
| optimize | optimize
| keycache
| partition_entry | partition_entry
| preload | preload
| prepare | prepare
...@@ -13765,6 +13769,13 @@ uninstall: ...@@ -13765,6 +13769,13 @@ uninstall:
} }
; ;
/* Avoid compiler warning from sql_yacc.cc where yyerrlab1 is not used */
keep_gcc_happy:
IMPOSSIBLE_ACTION
{
YYERROR;
}
/** /**
@} (end of group Parser) @} (end of group Parser)
*/ */
...@@ -65,5 +65,3 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@ ...@@ -65,5 +65,3 @@ archive_reader_LDFLAGS = @NOINST_LDFLAGS@
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -45,5 +45,3 @@ libblackhole_la_SOURCES= ha_blackhole.cc ...@@ -45,5 +45,3 @@ libblackhole_la_SOURCES= ha_blackhole.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -40,5 +40,3 @@ libcsv_la_CXXFLAGS = $(AM_CXXFLAGS) ...@@ -40,5 +40,3 @@ libcsv_la_CXXFLAGS = $(AM_CXXFLAGS)
libcsv_la_SOURCES = transparent_file.cc ha_tina.cc libcsv_la_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -45,5 +45,4 @@ libexample_la_SOURCES= ha_example.cc ...@@ -45,5 +45,4 @@ libexample_la_SOURCES= ha_example.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -48,5 +48,3 @@ libfederated_embedded_la_SOURCES= ha_federated.cc ...@@ -48,5 +48,3 @@ libfederated_embedded_la_SOURCES= ha_federated.cc
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -68,6 +68,3 @@ ha_federatedx_la_LIBADD = ...@@ -68,6 +68,3 @@ ha_federatedx_la_LIBADD =
# $(DTRACE) $(DTRACEFLAGS) -G -s federatedx_probes.d $(DTRACEFILES) # $(DTRACE) $(DTRACEFLAGS) -G -s federatedx_probes.d $(DTRACEFILES)
# End # End
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -64,6 +64,3 @@ libheap.a: libheap.la ...@@ -64,6 +64,3 @@ libheap.a: libheap.la
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -50,5 +50,3 @@ libibmdb2i_a_SOURCES= $(ha_ibmdb2i_la_SOURCES) ...@@ -50,5 +50,3 @@ libibmdb2i_a_SOURCES= $(ha_ibmdb2i_la_SOURCES)
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -169,6 +169,3 @@ ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES) ...@@ -169,6 +169,3 @@ ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
EXTRA_DIST= CMakeLists.txt plug.in \ EXTRA_DIST= CMakeLists.txt plug.in \
pars/make_bison.sh pars/make_flex.sh \ pars/make_bison.sh pars/make_flex.sh \
pars/pars0grm.y pars/pars0lex.l pars/pars0grm.y pars/pars0lex.l
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -338,6 +338,3 @@ ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES) ...@@ -338,6 +338,3 @@ ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES)
EXTRA_DIST= CMakeLists.txt plug.in \ EXTRA_DIST= CMakeLists.txt plug.in \
pars/make_bison.sh pars/make_flex.sh \ pars/make_bison.sh pars/make_flex.sh \
pars/pars0grm.y pars/pars0lex.l pars/pars0grm.y pars/pars0lex.l
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -206,6 +206,3 @@ test: ...@@ -206,6 +206,3 @@ test:
test-verbose: test-verbose:
HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests) HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -110,6 +110,3 @@ ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 ...@@ -110,6 +110,3 @@ ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
# so we don't build lockman-t and lockman1-t and lockman2-t # so we don't build lockman-t and lockman1-t and lockman2-t
CLEANFILES = maria_log_control page_cache_test_file_1 \ CLEANFILES = maria_log_control page_cache_test_file_1 \
maria_log.???????? maria_log.????????
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -165,6 +165,3 @@ SUFFIXES = .sh ...@@ -165,6 +165,3 @@ SUFFIXES = .sh
$< > $@-t $< > $@-t
@CHMOD@ +x $@-t @CHMOD@ +x $@-t
@MV@ $@-t $@ @MV@ $@-t $@
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -49,6 +49,3 @@ libmyisammrg.a: libmyisammrg.la ...@@ -49,6 +49,3 @@ libmyisammrg.a: libmyisammrg.la
$(CP) .libs/libmyisammrg.a $@ $(CP) .libs/libmyisammrg.a $@
EXTRA_DIST = CMakeLists.txt plug.in EXTRA_DIST = CMakeLists.txt plug.in
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -44,6 +44,3 @@ all-windoze-dsp: windoze ...@@ -44,6 +44,3 @@ all-windoze-dsp: windoze
find . -name '*.dsp' | grep -v SCCS | xargs unix2dos find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw $(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS` tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -127,6 +127,3 @@ testdoc: DUMMY ...@@ -127,6 +127,3 @@ testdoc: DUMMY
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -63,6 +63,3 @@ dist-hook: ...@@ -63,6 +63,3 @@ dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS` -rm -rf `find $(distdir) -type d -name SCCS`
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -48,6 +48,3 @@ libndbclient.dsp: Makefile \ ...@@ -48,6 +48,3 @@ libndbclient.dsp: Makefile \
@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp @$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD) @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
@touch dummy.cpp @touch dummy.cpp
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -28,6 +28,3 @@ libcommon_la_LIBADD = \ ...@@ -28,6 +28,3 @@ libcommon_la_LIBADD = \
util/libgeneral.la util/libgeneral.la
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -22,9 +22,6 @@ libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp E ...@@ -22,9 +22,6 @@ libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp E
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libtrace.dsp windoze-dsp: libtrace.dsp
libtrace.dsp: Makefile \ libtrace.dsp: Makefile \
......
...@@ -43,9 +43,6 @@ libsignaldataprint_la_SOURCES = \ ...@@ -43,9 +43,6 @@ libsignaldataprint_la_SOURCES = \
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libsignaldataprint.dsp windoze-dsp: libsignaldataprint.dsp
libsignaldataprint.dsp: Makefile \ libsignaldataprint.dsp: Makefile \
......
...@@ -22,8 +22,6 @@ liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp ...@@ -22,8 +22,6 @@ liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: liblogger.dsp windoze-dsp: liblogger.dsp
liblogger.dsp: Makefile \ liblogger.dsp: Makefile \
......
...@@ -25,9 +25,6 @@ include $(top_srcdir)/storage/ndb/config/common.mk.am ...@@ -25,9 +25,6 @@ include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libmgmsrvcommon.dsp windoze-dsp: libmgmsrvcommon.dsp
libmgmsrvcommon.dsp: Makefile \ libmgmsrvcommon.dsp: Makefile \
......
...@@ -54,6 +54,3 @@ libportlib.dsp: Makefile \ ...@@ -54,6 +54,3 @@ libportlib.dsp: Makefile \
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src) @$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -32,9 +32,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storag ...@@ -32,9 +32,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storag
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am include $(top_srcdir)/storage/ndb/config/type_util.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libtransporter.dsp windoze-dsp: libtransporter.dsp
libtransporter.dsp: Makefile \ libtransporter.dsp: Makefile \
......
...@@ -46,9 +46,6 @@ testBitmask.o: $(testBitmask_SOURCES) ...@@ -46,9 +46,6 @@ testBitmask.o: $(testBitmask_SOURCES)
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am include $(top_srcdir)/storage/ndb/config/type_util.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libgeneral.dsp windoze-dsp: libgeneral.dsp
libgeneral.dsp: Makefile \ libgeneral.dsp: Makefile \
......
...@@ -16,6 +16,3 @@ ...@@ -16,6 +16,3 @@
SUBDIRS = cpcd SUBDIRS = cpcd
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -28,7 +28,4 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am ...@@ -28,7 +28,4 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am
ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@ ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: windoze-dsp:
...@@ -70,6 +70,3 @@ storage/ndbd.dsp: Makefile \ ...@@ -70,6 +70,3 @@ storage/ndbd.dsp: Makefile \
@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES) @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -64,10 +64,4 @@ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -64,10 +64,4 @@ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -24,6 +24,3 @@ ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -24,6 +24,3 @@ ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -30,6 +30,3 @@ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -30,6 +30,3 @@ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -24,6 +24,3 @@ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -24,6 +24,3 @@ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -26,6 +26,3 @@ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -26,6 +26,3 @@ ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -23,6 +23,3 @@ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \ ...@@ -23,6 +23,3 @@ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -22,9 +22,6 @@ liberror_a_SOURCES = TimeModule.cpp \ ...@@ -22,9 +22,6 @@ liberror_a_SOURCES = TimeModule.cpp \
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: liberror.dsp windoze-dsp: liberror.dsp
liberror.dsp: Makefile \ liberror.dsp: Makefile \
......
...@@ -43,9 +43,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi ...@@ -43,9 +43,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libkernel.dsp windoze-dsp: libkernel.dsp
libkernel.dsp: Makefile \ libkernel.dsp: Makefile \
......
...@@ -29,9 +29,6 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am ...@@ -29,9 +29,6 @@ include $(top_srcdir)/storage/ndb/config/type_util.mk.am
#ndbtest_PROGRAMS = ndb_test_mgmapi #ndbtest_PROGRAMS = ndb_test_mgmapi
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libmgmapi.dsp windoze-dsp: libmgmapi.dsp
libmgmapi.dsp: Makefile \ libmgmapi.dsp: Makefile \
......
...@@ -44,9 +44,6 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \ ...@@ -44,9 +44,6 @@ LDADD_LOC = $(noinst_LTLIBRARIES) \
ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
ndb_mgm.dsp: Makefile \ ndb_mgm.dsp: Makefile \
......
...@@ -57,9 +57,6 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am ...@@ -57,9 +57,6 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: ndb_mgmd.dsp windoze-dsp: ndb_mgmd.dsp
ndb_mgmd.dsp: Makefile \ ndb_mgmd.dsp: Makefile \
......
...@@ -71,9 +71,6 @@ ndberror_check_LDFLAGS = \ ...@@ -71,9 +71,6 @@ ndberror_check_LDFLAGS = \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libndbapi.dsp windoze-dsp: libndbapi.dsp
libndbapi.dsp: Makefile \ libndbapi.dsp: Makefile \
......
...@@ -21,6 +21,3 @@ dist-hook: ...@@ -21,6 +21,3 @@ dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS` -rm -rf `find $(distdir) -type d -name SCCS`
windoze-dsp: windoze-dsp:
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -125,10 +125,6 @@ testBackup_LDADD = $(LDADD) bank/libbank.a ...@@ -125,10 +125,6 @@ testBackup_LDADD = $(LDADD) bank/libbank.a
testSRBank_LDADD = bank/libbank.a $(LDADD) testSRBank_LDADD = bank/libbank.a $(LDADD)
NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \ windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
testScan.dsp testScan.dsp
......
...@@ -32,7 +32,4 @@ LDADD_LOC = $(noinst_LIBRARIES) ...@@ -32,7 +32,4 @@ LDADD_LOC = $(noinst_LIBRARIES)
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: windoze-dsp:
...@@ -51,7 +51,4 @@ wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run ...@@ -51,7 +51,4 @@ wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: windoze-dsp:
...@@ -31,9 +31,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/ ...@@ -31,9 +31,6 @@ INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/
include $(top_srcdir)/storage/ndb/config/common.mk.am include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: libNDBT.dsp windoze-dsp: libNDBT.dsp
libNDBT.dsp: Makefile \ libNDBT.dsp: Makefile \
......
...@@ -43,7 +43,4 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am ...@@ -43,7 +43,4 @@ include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
ndb_cpcc_LDADD = $(LDADD) ndb_cpcc_LDADD = $(LDADD)
ndb_cpcc_LDFLAGS = -static ndb_cpcc_LDFLAGS = -static
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: windoze-dsp:
...@@ -75,9 +75,6 @@ ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@ ...@@ -75,9 +75,6 @@ ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@ ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
ndb_config_LDFLAGS = @ndb_bin_am_ldflags@ ndb_config_LDFLAGS = @ndb_bin_am_ldflags@
# Don't update the files from bitkeeper
%::SCCS/s.%
windoze-dsp: \ windoze-dsp: \
ndb_waiter.dsp \ ndb_waiter.dsp \
ndb_drop_table.dsp \ ndb_drop_table.dsp \
......
...@@ -339,6 +339,3 @@ ha_xtradb_la_SOURCES= $(libxtradb_la_SOURCES) ...@@ -339,6 +339,3 @@ ha_xtradb_la_SOURCES= $(libxtradb_la_SOURCES)
EXTRA_DIST= CMakeLists.txt plug.in \ EXTRA_DIST= CMakeLists.txt plug.in \
pars/make_bison.sh pars/make_flex.sh \ pars/make_bison.sh pars/make_flex.sh \
pars/pars0grm.y pars/pars0lex.l pars/pars0grm.y pars/pars0lex.l
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -52,6 +52,3 @@ SUFFIXES = .sh ...@@ -52,6 +52,3 @@ SUFFIXES = .sh
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
$< > $@-t $< > $@-t
@MV@ $@-t $@ @MV@ $@-t $@
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -18,6 +18,3 @@ ...@@ -18,6 +18,3 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
EXTRA_DIST = mysql.fc mysql.te EXTRA_DIST = mysql.fc mysql.te
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -22,6 +22,3 @@ LDADD = -lmytap ...@@ -22,6 +22,3 @@ LDADD = -lmytap
# We omit core-t here, since it will always fail. # We omit core-t here, since it will always fail.
noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -25,6 +25,3 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ ...@@ -25,6 +25,3 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt
noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -23,6 +23,3 @@ libmytap_a_SOURCES = tap.c ...@@ -23,6 +23,3 @@ libmytap_a_SOURCES = tap.c
EXTRA_DIST = CMakeLists.txt EXTRA_DIST = CMakeLists.txt
SUBDIRS = . t SUBDIRS = . t
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -20,6 +20,3 @@ AM_LDFLAGS = -L$(top_builddir)/unittest/mytap ...@@ -20,6 +20,3 @@ AM_LDFLAGS = -L$(top_builddir)/unittest/mytap
LDADD = -lmytap LDADD = -lmytap
noinst_PROGRAMS = basic-t noinst_PROGRAMS = basic-t
# Don't update the files from bitkeeper
%::SCCS/s.%
...@@ -22,6 +22,3 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ ...@@ -22,6 +22,3 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
noinst_PROGRAMS = strings-t noinst_PROGRAMS = strings-t
# Don't update the files from bitkeeper
%::SCCS/s.%
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment