bk commit into 5.0 tree (tsmith:1.2556)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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@stripped, 2007-11-09 18:27:20-07:00, tsmith@stripped +2 -0
  Fix Windows build problems.

  libmysql/CMakeLists.txt@stripped, 2007-11-09 18:27:19-07:00, tsmith@stripped +1 -1
    Add new mysys/mf_arr_appstr.c source file

  mysys/default.c@stripped, 2007-11-09 18:27:19-07:00, tsmith@stripped +7 -7
    Fix some bad code that caused warnings on Windows

diff -Nrup a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
--- a/libmysql/CMakeLists.txt	2007-08-03 13:48:32 -06:00
+++ b/libmysql/CMakeLists.txt	2007-11-09 18:27:19 -07:00
@@ -74,7 +74,7 @@ SET(CLIENT_SOURCES   ../mysys/array.c ..
                      ../mysys/hash.c ../mysys/my_sleep.c ../mysys/default_modify.c
                      get_password.c ../strings/int2str.c ../strings/is_prefix.c 
                      libmysql.c ../mysys/list.c ../strings/llstr.c
-                     ../strings/longlong2str.c manager.c ../mysys/mf_cache.c 
+                     ../strings/longlong2str.c manager.c ../mysys/mf_arr_appstr.c ../mysys/mf_cache.c
                      ../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c 
                      ../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c 
                      ../mysys/mf_pack.c ../mysys/mf_path.c ../mysys/mf_tempfile.c ../mysys/mf_unixpath.c 
diff -Nrup a/mysys/default.c b/mysys/default.c
--- a/mysys/default.c	2007-11-07 15:23:49 -07:00
+++ b/mysys/default.c	2007-11-09 18:27:19 -07:00
@@ -997,14 +997,14 @@ static uint my_get_system_windows_direct
 
 static void init_default_directories_win()
 {
-  bzero(default_directories, sizeof(default_directories));
+  bzero((char *) default_directories, sizeof(default_directories));
 
   if (my_get_system_windows_directory(shared_system_dir,
                                       sizeof(shared_system_dir)))
-    ADD_DIRECTORY(&shared_system_dir);
+    ADD_DIRECTORY(shared_system_dir);
 
   if (GetWindowsDirectory(system_dir,sizeof(system_dir)))
-    ADD_DIRECTORY(&system_dir);
+    ADD_DIRECTORY(system_dir);
 
   ADD_DIRECTORY("C:/");
 
@@ -1037,7 +1037,7 @@ static void init_default_directories_win
         last= end;
       }
     }
-    ADD_DIRECTORY(&config_dir);
+    ADD_DIRECTORY(config_dir);
   }
 
   ADD_COMMON_DIRECTORIES();
@@ -1058,7 +1058,7 @@ static void (*init_default_directories)(
 
 static void init_default_directories_netware()
 {
-  bzero(default_directories, sizeof(default_directories));
+  bzero((char *) default_directories, sizeof(default_directories));
   ADD_DIRECTORY("sys:/etc/");
   ADD_COMMON_DIRECTORIES();
 }
@@ -1081,7 +1081,7 @@ static void init_default_directories_os2
 {
   const char *env;
 
-  bzero(default_directories, sizeof(default_directories));
+  bzero((char *) default_directories, sizeof(default_directories));
   ADD_DIRECTORY("/etc/");
   if ((env= getenv("ETC")))
     ADD_DIRECTORY(env);
@@ -1105,7 +1105,7 @@ static void (*init_default_directories)(
 
 static void init_default_directories_unix()
 {
-  bzero(default_directories, sizeof(default_directories));
+  bzero((char *) default_directories, sizeof(default_directories));
   ADD_DIRECTORY("/etc/");
 #ifdef DEFAULT_SYSCONFDIR
   if (DEFAULT_SYSCONFDIR != "")