Commit 5b8fca74 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/home/bar/mysql-4.1
parents 06cf873d 2ab265d0

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -3093,7 +3093,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl 
   ndb/src/common/logger/Makefile dnl

   ndb/src/common/transporter/Makefile dnl

   ndb/src/common/mgmcommon/Makefile dnl

   ndb/src/common/editline/Makefile dnl

   ndb/src/kernel/Makefile dnl

   ndb/src/kernel/error/Makefile dnl

   ndb/src/kernel/blocks/Makefile dnl

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem 
CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)



INCLUDES =			-I$(srcdir)/../include -I../include -I..

bin_PROGRAMS =		mysql_test_run_new

EXTRA_PROGRAMS =		mysql_test_run_new

noinst_HEADERS =	my_manage.h

mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c

ndb/src/common/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS =	portlib debugger util logger transporter mgmcommon editline

SUBDIRS =	portlib debugger util logger transporter mgmcommon



noinst_LTLIBRARIES = libcommon.la

ndb/src/common/Makefile_old

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
include .defs.mk



LIB_DIRS := \

        portlib		\

        debugger	\

        util		\

        logger



ifneq ($(USE_EDITLINE), N)

LIB_DIRS += editline

endif



DIRS := transporter mgmcommon



include $(NDB_TOP)/Epilogue.mk

ndb/src/common/debugger/Makefile_old

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
include .defs.mk



TYPE := kernel

DIRS := signaldata



PIC_ARCHIVE    := Y

ARCHIVE_TARGET := trace



SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp LogLevel.cpp EventLogger.cpp GrepError.cpp



include $(NDB_TOP)/Epilogue.mk