diff options
| author | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
|---|---|---|
| committer | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
| commit | a9a4202c9c34e8adf96f6f71ca4e885774b86232 (patch) | |
| tree | 5559454081305d161db89d28c1ecf96622161483 /include | |
| parent | 9b871930a9189cce16b39dc5576f3592a34959ba (diff) | |
| parent | 59a33015b461216c22fdf51585a53c9afecf9bfb (diff) | |
| download | mariadb-git-a9a4202c9c34e8adf96f6f71ca4e885774b86232.tar.gz | |
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean
sql/table.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index 8d937ffed22..75133ddc837 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -384,6 +384,7 @@ inline double ulonglong2double(ulonglong value) #define FN_LIBCHAR '\\' #define FN_ROOTDIR "\\" +#define FN_DEVCHAR ':' #define FN_NETWORK_DRIVES /* Uses \\ to indicate network drives */ #define FN_NO_CASE_SENCE /* Files are not case-sensitive */ #define OS_FILE_LIMIT 2048 diff --git a/include/my_global.h b/include/my_global.h index 7adf4845984..e7205c94c18 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -599,7 +599,6 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */ #define FN_CURLIB '.' /* ./ is used as abbrev for current dir */ #define FN_PARENTDIR ".." /* Parent directory; Must be a string */ -#define FN_DEVCHAR ':' #ifndef FN_LIBCHAR #ifdef __EMX__ |