diff options
| author | unknown <cmiller@zippy.(none)> | 2006-06-13 16:06:35 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-06-13 16:06:35 -0400 |
| commit | 0e3a1143cbcf761a25df7fb6c99c7154d8f287e7 (patch) | |
| tree | 8719a5a0706de5334b4142c3a7f4efeec5419444 /include/my_global.h | |
| parent | e803142a431b63cd9be805954a3d562ede0fa4c2 (diff) | |
| parent | a5fc64f469853a331822185854d309d970c4eea6 (diff) | |
| download | mariadb-git-0e3a1143cbcf761a25df7fb6c99c7154d8f287e7.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/table.cc:
Null-merged, as this doesn't apply after 5.1.4 . -cm
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index f2ad3af0b6f..f3f3825957f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -681,7 +681,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 #define FN_LIBCHAR '/' |