Merge with 4.0.8

BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
acinclude.m4:
  Auto merged
include/mysql.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/table.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

2 files changed, 2 insertions, 2 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 3e6e9d40fab..1ca342f3998 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -3656,7 +3656,7 @@ void update_key_parts(MI_KEYDEF *keyinfo, ulong *rec_per_key_part,
 }
 
 
-ha_checksum mi_byte_checksum(const byte *buf, uint length)
+static ha_checksum mi_byte_checksum(const byte *buf, uint length)
 {
   ha_checksum crc;
   const byte *end=buf+length;
diff --git a/myisam/mi_test1.c b/myisam/mi_test1.c
index 1c2b3f13baa..6aa4b9cf9f1 100644
--- a/myisam/mi_test1.c
+++ b/myisam/mi_test1.c
@@ -57,7 +57,7 @@ int main(int argc,char *argv[])
 }
 
 
-int run_test(const char *filename)
+static int run_test(const char *filename)
 {
   MI_INFO *file;
   int i,j,error,deleted,rec_length,uniques=0;