merged with 3.23 replication updates

mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged

3 files changed, 10 insertions, 2 deletions

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 68cb64266a8..895c813c9e6 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -37,8 +37,10 @@ From: $FROM
 To: $INTERNALS
 Subject: bk commit into 4.0 tree
 
-Below is the list of changes that have just been pushed into main
-4.0 repository. For information on how to access the repository
+Below is the list of changes that have just been committed into a
+4.0 repository of $USER. When $USER does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html
 
 EOF
diff --git a/BitKeeper/triggers/post-incoming b/BitKeeper/triggers/post-incoming
new file mode 100755
index 00000000000..f1ea2255de9
--- /dev/null
+++ b/BitKeeper/triggers/post-incoming
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+echo "Test: post-incoming works"
diff --git a/BitKeeper/triggers/post-outgoing b/BitKeeper/triggers/post-outgoing
new file mode 100755
index 00000000000..3fc2cdbad67
--- /dev/null
+++ b/BitKeeper/triggers/post-outgoing
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+echo "Test: post-outgoing works"