Commit 052225a4 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 776dea81 a817bd38

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
tonu@hundin.mysql.fi

sasha@mysql.sashanet.com

include/mysql_com.h

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY, 
			  COM_PROCESS_INFO,COM_CONNECT,COM_PROCESS_KILL,

			  COM_DEBUG,COM_PING,COM_TIME,COM_DELAYED_INSERT,

			  COM_CHANGE_USER, COM_BINLOG_DUMP,

                          COM_TABLE_DUMP, COM_CONNECT_OUT};

                          COM_TABLE_DUMP, COM_CONNECT_OUT,

			  COM_REGISTER_SLAVE};



#define NOT_NULL_FLAG	1		/* Field can't be NULL */

#define PRI_KEY_FLAG	2		/* Field is part of a primary key */

mysql-test/mysql-test-run.sh

+2 −0
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ start_slave() 
	    --tmpdir=$MYSQL_TMP_DIR \

            --language=english \

	    --skip-innodb --skip-slave-start \

	    --report-host=127.0.0.1 --report-user=root \

	    --report-port=$SLAVE_MYPORT \

	     $SMALL_SERVER \

             $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"

    if [ x$DO_DDD = x1 ]

mysql-test/r/rpl000002.result

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ n 
2000

2001

2002

Server_id	Host	User	Password	Port

2	127.0.0.1	root		9307

id	created

1	1970-01-01 06:25:45

id	created

mysql-test/t/rpl000002.test

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use test; 
sync_with_master;

select * from t1;

connection master;

show slave hosts;

drop table t1;

save_master_pos;

connection slave;