diff options
| author | marty@linux.site <> | 2005-06-30 12:20:52 +0200 |
|---|---|---|
| committer | marty@linux.site <> | 2005-06-30 12:20:52 +0200 |
| commit | e4aedcc2c137ba667e3d429031ce284032e11060 (patch) | |
| tree | d61554cba3c2aa34bee31d02127690c317681d2a /mysys/default.c | |
| parent | 5e4ce743a351f7d1ee55b534dd689e2d082fa146 (diff) | |
| parent | 2eea2f52089028e97ab1c3b9e33e68fd8eadb094 (diff) | |
| download | mariadb-git-e4aedcc2c137ba667e3d429031ce284032e11060.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into linux.site:/home/marty/MySQL/mysql-5.0
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 45b27806dc4..1fa8deaa65c 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -914,7 +914,7 @@ static void init_default_directories() /* Only add shared system directory if different from default. */ if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) && strcmp(system_dir, shared_system_dir)) - *ptr++= &shared_system_dir; + *ptr++= (char *)&shared_system_dir; #endif #elif defined(__NETWARE__) |