Fixed timing problem with rpl000001 replication test.

Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.


BitKeeper/deleted/.del-set_var.cc~5374527de1955359:
  Delete: libmysqld/set_var.cc
BitKeeper/etc/ignore:
  added libmysqld/set_var.cc
Build-tools/Do-compile:
  Remove warnings from touch during compilation
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Added real_sleep command
configure.in:
  Fixed type for HPUX10
innobase/configure.in:
  Fixed type for openbsd
libmysql/libmysql.c:
  Fix for new SHOW SLAVE STATUS
myisam/mi_update.c:
  Update key file if using external locking
mysql-test/mysql-test-run.sh:
  Safety fix
mysql-test/r/rpl000015.result:
  Update for new SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Update for new SHOW SLAVE STATUS
mysql-test/t/rpl000001.test:
  sleep -> real_sleep to avoid timing problem
sql/mysqld.cc:
  Fixed bug with SIGTERM on Solaris
sql/slave.cc:
  SHOW SLAVE STATUS returns empty sets if slave is not initialized.
sql/sql_repl.cc:
  SHOW MASTER STAT returns empty set if no binary logging.

4 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 146d6ba12ff..a4e9b0ea08a 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -873,7 +873,7 @@ start_slave()
           --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \
           --report-host=127.0.0.1 --report-user=root \
           --report-port=$slave_port \
-          --master-retry-count=5 \
+          --master-retry-count=10 \
           -O slave_net_timeout=10 \
            $SMALL_SERVER \
            $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index a35004298e0..7010349e5ff 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -5,7 +5,6 @@ master-bin.001	79
 reset slave;
 show slave status;
 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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-		0	0		0		0		No	No			0		0	0	0
 change master to master_host='127.0.0.1';
 show slave status;
 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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
diff --git a/mysql-test/r/rpl_empty_master_crash.result b/mysql-test/r/rpl_empty_master_crash.result
index 66e28b32312..5a82df19ef5 100644
--- a/mysql-test/r/rpl_empty_master_crash.result
+++ b/mysql-test/r/rpl_empty_master_crash.result
@@ -7,6 +7,5 @@ slave start;
 drop table if exists t1;
 show slave status;
 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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-		0	0		0		0		No	No			0		0	0	0
 load table t1 from master;
 Error in fetch_master_table
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index fb4255f27b3..0f195c65fb0 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -18,8 +18,10 @@ set password for root@"localhost" = password('foo');
 connection slave;
 slave start;
 connection master;
+#
 # Give slave time to do at last one failed connect retry
-sleep 2;
+# This one must be short so that the slave will not stop retrying
+real_sleep 2;
 set password for root@"localhost" = password('');
 # Give slave time to connect (will retry every second)
 sleep 2;