Commit 3bea3620 authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 

into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
parents bf065810 bb35cd04

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	item_geofunc.cc item_subselect.cc item_row.cc\

	item_xmlfunc.cc \

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

	log_event.cc \

	log_event.cc rpl_record.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 \

mysql-test/r/rpl_ndb_circular_simplex.result

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	468

Exec_Master_Log_Pos	754

Relay_Log_Space	#

Until_Condition	None

Until_Log_File

mysql-test/r/rpl_ndb_log.result

+6 −6
Original line number Diff line number Diff line
@@ -99,33 +99,33 @@ show binlog events in 'slave-bin.000001' from 4; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; drop table t1

slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	1	#	table_id: #

slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB

slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4

show binlog events in 'slave-bin.000002' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB

slave-bin.000002	#	Query	1	#	BEGIN

slave-bin.000002	#	Query	2	#	BEGIN

slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000002	#	Write_rows	2	#	table_id: #

slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Query	1	#	COMMIT

slave-bin.000002	#	Query	2	#	COMMIT

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	617	#	#	master-bin.000002	Yes	Yes				#			0		0	617	#	None		0	No						#	No

sql/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
               hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.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 

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

               log_event.cc rpl_record.cc

               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

sql/Makefile.am

+4 −3
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			log.h sql_show.h rpl_rli.h rpl_mi.h \

			sql_select.h structs.h table.h sql_udf.h hash_filo.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 \

			sql_repl.h slave.h rpl_filter.h rpl_injector.h \

			log_event.h rpl_record.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 \
@@ -87,8 +87,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			sql_prepare.cc sql_error.cc sql_locale.cc \

			sql_update.cc sql_delete.cc uniques.cc sql_do.cc \

			procedure.cc sql_test.cc \

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

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

			unireg.cc des_key_file.cc \

			log_event.cc rpl_record.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 \