Commit 30a648dc authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god

Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51-fix
parents 6937e154 faf9d4e9
Branches unavailable
Tags unavailable
No related merge requests found
......@@ -75,7 +75,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
......
......@@ -1006,14 +1006,14 @@ static size_t my_get_system_windows_directory(char *buffer, size_t 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:/");
......@@ -1046,7 +1046,7 @@ static void init_default_directories_win()
last= end;
}
}
ADD_DIRECTORY(&config_dir);
ADD_DIRECTORY(config_dir);
}
ADD_COMMON_DIRECTORIES();
......@@ -1067,7 +1067,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();
}
......@@ -1090,7 +1090,7 @@ static void (*init_default_directories)()= init_default_directories_netware;
static void init_default_directories_unix()
{
bzero(default_directories, sizeof(default_directories));
bzero((char *) default_directories, sizeof(default_directories));
ADD_DIRECTORY("/etc/");
ADD_DIRECTORY("/etc/mysql/");
#ifdef DEFAULT_SYSCONFDIR
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment