Commit bf065810 authored by unknown's avatar unknown
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  romeo.(none):/home/bkroot/mysql-5.1-rpl
parents d8cb1181 337031f1

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h rpl_constants.h \

	log_event.cc my_decimal.h my_decimal.cc

	log_event.cc my_decimal.h my_decimal.cc \

	log_event_old.h log_event_old.cc \

	rpl_record_old.h rpl_record_old.cc

strings_src=decimal.c



link_sources:

client/mysqlbinlog.cc

+2 −0
Original line number Diff line number Diff line
@@ -1600,10 +1600,12 @@ int main(int argc, char** argv) 
#include "decimal.c"

#include "my_decimal.cpp"

#include "log_event.cpp"

#include "log_event_old.cpp"

#else

#include "my_decimal.h"

#include "decimal.c"

#include "my_decimal.cc"

#include "log_event.cc"

#include "log_event_old.cc"

#endif

libmysqld/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \

	item_geofunc.cc item_subselect.cc item_row.cc\

	item_xmlfunc.cc \

	key.cc lock.cc log.cc log_event.cc sql_state.c \

	key.cc lock.cc log.cc sql_state.c \

	log_event.cc \

	log_event_old.cc rpl_record_old.cc \

	protocol.cc net_serv.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	sql_load.cc discover.cc sql_locale.cc \

sql/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
               item_create.cc item_func.cc item_geofunc.cc item_row.cc 

               item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc 

               key.cc log.cc lock.cc log_event.cc message.rc 

               log_event_old.cc rpl_record_old.cc

               message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c

               mysqld.cc net_serv.cc 

               nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc

sql/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			lex.h lex_symbol.h sql_acl.h sql_crypt.h  \

			log_event.h sql_repl.h slave.h rpl_filter.h \

			rpl_injector.h \

			log_event_old.h rpl_record_old.h \

			stacktrace.h sql_sort.h sql_cache.h set_var.h \

			spatial.h gstream.h client_settings.h tzfile.h \

			tztime.h my_decimal.h\
@@ -88,6 +89,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			procedure.cc sql_test.cc \

			log.cc log_event.cc init.cc derror.cc sql_acl.cc \

			unireg.cc des_key_file.cc \

			log_event_old.cc rpl_record_old.cc \

			discover.cc time.cc opt_range.cc opt_sum.cc \

		   	records.cc filesort.cc handler.cc \

			ha_partition.cc \