Commit 0ae142f5 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 38ede907 e8ffda53

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ extern int my_printf_error _VARARGS((uint my_err, const char *format, 
				    __attribute__ ((format (printf, 2, 4))));

extern int my_vsnprintf( char *str, size_t n,

                                const char *format, va_list ap );



extern int my_snprintf(char* to, size_t n, const char* fmt, ...);

extern int my_message(uint my_err, const char *str,myf MyFlags);

extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);

extern int my_message_curses(uint my_err, const char *str,myf MyFlags);

include/mysqld_error.h

+6 −1
Original line number Diff line number Diff line
@@ -198,4 +198,9 @@ 
#define ER_CRASHED_ON_REPAIR 1195

#define ER_WARNING_NOT_COMPLETE_ROLLBACK 1196

#define ER_TRANS_CACHE_FULL 1197

#define ER_ERROR_MESSAGES 198
 
#define ER_SLAVE_MUST_STOP 1198

#define ER_SLAVE_NOT_RUNNING 1199

#define ER_BAD_SLAVE 1200

#define ER_MASTER_INFO 1201

#define ER_SLAVE_THREAD 1202

#define ER_ERROR_MESSAGES 203

mysql-test/r/rpl000014.result

+8 −8
Original line number Diff line number Diff line 
File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	73		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	1	master-bin.001	73	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	1	master-bin.001	73	No		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	1	master-bin.001	73	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	1	master-bin.001	173	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	73	No			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	73	Yes			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	1	master-bin.001	173	Yes			0		0

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	73		

n

mysql-test/r/rpl000015.result

+8 −8
Original line number Diff line number Diff line 
File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	73		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

		0	0		0	No		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	test	3306	60		4	No		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60		4	No		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60	master-bin.001	73	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

		0	0		0	No			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	test	3306	60		4	No			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	60		4	No			0		0

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	60	master-bin.001	73	Yes			0		0

n

10

45

mysql-test/r/rpl000016.result

+14 −5
Original line number Diff line number Diff line 
Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60	master-bin.001	216	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	60	master-bin.001	216	Yes			0		0

s

Could not break slave

Tried hard
@@ -7,12 +7,21 @@ Log_name 
master-bin.001

master-bin.002

master-bin.003

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	60	master-bin.003	129	Yes			1062	error 'Duplicate entry '1234' for key 1' on query 'insert into t2 values(1234)'	0

Log_name

master-bin.003

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60	master-bin.003	128	Yes		

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

127.0.0.1	root	9306	60	master-bin.003	184	Yes			0		0

m

34

65

67

123

65
 
1234

Log_name

master-bin.003

master-bin.004

master-bin.005

count(*)

100