bk commit into 4.1 tree (sasha:1.2356)

[Sasha Pachev]

Below is the list of changes that have just been committed into a local
4.1 repository of sasha. When sasha does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2356 05/07/28 19:08:01 sasha@stripped +3 -0
  patch for bug 10780

  mysql-test/r/rpl_slave_status.result
    1.1 05/07/28 19:07:33 sasha@stripped +23 -0
    New BitKeeper file ``mysql-test/r/rpl_slave_status.result''

  sql/slave.h
    1.86 05/07/28 19:07:33 sasha@stripped +1 -0
    bug 10780

  mysql-test/r/rpl_slave_status.result
    1.0 05/07/28 19:07:33 sasha@stripped +0 -0
    BitKeeper file /reiser-data/mysql-dev/mysql-4.1/mysql-test/r/rpl_slave_status.result

  sql/slave.cc
    1.273 05/07/28 19:07:32 sasha@stripped +3 -2
    bug 10780

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-4.1

--- 1.272/sql/slave.cc	2005-07-27 04:21:36 -06:00
+++ 1.273/sql/slave.cc	2005-07-28 19:07:32 -06:00
@@ -2186,7 +2186,8 @@
 		    &my_charset_bin);
     protocol->store((ulonglong) mi->rli.group_relay_log_pos);
     protocol->store(mi->rli.group_master_log_name, &my_charset_bin);
-    protocol->store(mi->slave_running ? "Yes":"No", &my_charset_bin);
+    protocol->store(mi->slave_running == MYSQL_SLAVE_RUN_CONNECT
+        ? "Yes":"No", &my_charset_bin);
     protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin);
     protocol->store(&replicate_do_db);
     protocol->store(&replicate_ignore_db);
@@ -3078,7 +3079,7 @@
   pthread_mutex_lock(&LOCK_thread_count);
   threads.append(thd);
   pthread_mutex_unlock(&LOCK_thread_count);
-  mi->slave_running = 1;
+  mi->slave_running = MYSQL_SLAVE_RUN_INIT;
   mi->abort_slave = 0;
   pthread_mutex_unlock(&mi->run_lock);
   pthread_cond_broadcast(&mi->start_cond);
--- New file ---
+++ mysql-test/r/rpl_slave_status.result	05/07/28 19:07:33
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
grant replication slave on *.* to rpl@stripped identified by 'rpl';
stop slave;
change master to master_user='rpl',master_password='rpl';
start slave;
drop table if exists t1;
create table t1 (n int);
insert into t1 values (1);
select * from t1;
n
1
delete from mysql.user where user='rpl';
flush privileges;
stop slave;
start slave;
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
Connecting to master	127.0.0.1	rpl	MASTER_MYPORT	1	master-bin.000001	357	slave-relay-bin.000001	401	master-bin.000001	No	Yes							0		0	357	401	None		0	No						NULL


--- 1.85/sql/slave.h	2005-03-23 11:19:09 -07:00
+++ 1.86/sql/slave.h	2005-07-28 19:07:33 -06:00
@@ -112,6 +112,7 @@
 #define MYSQL_SLAVE_NOT_RUN         0
 #define MYSQL_SLAVE_RUN_NOT_CONNECT 1
 #define MYSQL_SLAVE_RUN_CONNECT     2
+#define MYSQL_SLAVE_RUN_INIT        3
 
 /****************************************************************************