mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51-fix


include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
mysys/default.c:
  Manual merge
This commit is contained in:
unknown 2007-11-09 18:29:18 -07:00
commit 3cbe941717
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mysys/default.c
View file

@ -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