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

Merge work:/home/bk/mysql-4.0 

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents f3299061 c01d4e1e

include/mysqld_error.h

+2 −1
Original line number Diff line number Diff line
@@ -213,4 +213,5 @@ 
#define ER_CONNECT_TO_MASTER 1210

#define ER_QUERY_ON_MASTER 1211

#define ER_SHOW_BINLOG_EVENTS 1212

#define ER_ERROR_MESSAGES 213
 
#define ER_SHOW_NEW_MASTER 1213

#define ER_ERROR_MESSAGES 214

mysql-test/fix-result

0 → 100755
+22 −0
Original line number Diff line number Diff line 
#! /bin/sh



# Sasha's hack to fix results generated with mysql-test-run --record

# to be version and test port independent. In some cases, further minor

# manual edititing may be required, but most of the time it should not

# happen



#It is assumed we are running the script in mysql-test directory



VERSION=4.0.0-debug-log

TEST_CASE=$1



if [ -z "$TEST_CASE" ] ;

then

 echo "usage: $0 test_case_name"

 exit 1

fi



../extra/replace $VERSION '$VERSION' 9306 '$MASTER_MYPORT' 9307 \

'$SLAVE_MYPORT' \\ \\\\ --  r/$TEST_CASE.result

mysql-test/r/rpl_log.result

+10 −0
Original line number Diff line number Diff line
@@ -55,3 +55,13 @@ slave-bin.002 190 Query 1 3 use test; insert into t1 values (1) 
slave-bin.002	250	Query	1	4	use test; drop table t1

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	Last_log_seq

127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	245	Yes			0		0	4

Log_name	Log_pos

slave-bin.001	132

Log_name	Log_pos

slave-bin.001	225

Log_name	Log_pos

slave-bin.001	439

Log_name	Log_pos

slave-bin.002	132

Log_name	Log_pos

slave-bin.002	250

mysql-test/t/rpl_log.test

+10 −0
Original line number Diff line number Diff line
@@ -36,3 +36,13 @@ show master logs; 
show binlog events in 'slave-bin.001' from 4;

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

show slave status;

show new master for slave with master_log_file='master-bin.001' and

 master_log_pos=4 and master_log_seq=1 and master_server_id=1;

show new master for slave with master_log_file='master-bin.001' and

 master_log_pos=79 and master_log_seq=2 and master_server_id=1;

show new master for slave with master_log_file='master-bin.001' and

 master_log_pos=311 and master_log_seq=6 and master_server_id=1;

show new master for slave with master_log_file='master-bin.002' and

 master_log_pos=4 and master_log_seq=1 and master_server_id=1;

show new master for slave with master_log_file='master-bin.002' and

 master_log_pos=137 and master_log_seq=3 and master_server_id=1;

sql/lex.h

+3 −0
Original line number Diff line number Diff line
@@ -215,8 +215,10 @@ static SYMBOL symbols[] = { 
  { "MASTER_HOST",           SYM(MASTER_HOST_SYM),0,0},

  { "MASTER_LOG_FILE",           SYM(MASTER_LOG_FILE_SYM),0,0},

  { "MASTER_LOG_POS",           SYM(MASTER_LOG_POS_SYM),0,0},

  { "MASTER_LOG_SEQ",           SYM(MASTER_LOG_SEQ_SYM),0,0},

  { "MASTER_PASSWORD",           SYM(MASTER_PASSWORD_SYM),0,0},

  { "MASTER_PORT",           SYM(MASTER_PORT_SYM),0,0},

  { "MASTER_SERVER_ID",           SYM(MASTER_SERVER_ID_SYM),0,0},

  { "MASTER_USER",           SYM(MASTER_USER_SYM),0,0},

  { "MAX_ROWS",		SYM(MAX_ROWS),0,0},

  { "MATCH",		SYM(MATCH),0,0},
@@ -237,6 +239,7 @@ static SYMBOL symbols[] = { 
  { "NATURAL",		SYM(NATURAL),0,0},

  { "NATIONAL",		SYM(NATIONAL_SYM),0,0},

  { "NEXT",		SYM(NEXT_SYM),0,0},

  { "NEW",              SYM(NEW_SYM),0,0},

  { "NCHAR",		SYM(NCHAR_SYM),0,0},

  { "NO",		SYM(NO_SYM),0,0},

  { "NOT",		SYM(NOT),0,0},