Commit faf9d4e9 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Fix Windows build problems.

parent 30b56973

libmysql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.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

mysys/default.c

+7 −7
Original line number Diff line number Diff line
@@ -997,14 +997,14 @@ static uint my_get_system_windows_directory(char *buffer, uint size) 


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)()= init_default_directories_win; 


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)()= init_default_directories_os2; 


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 != "")