diff options
author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /sql/unireg.h | |
parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 9b220f87918..c4d2052d1da 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -70,11 +70,6 @@ #define FERR -1 /* Error from my_functions */ #define CREATE_MODE 0 /* Default mode on new files */ #define NAMES_SEP_CHAR '\377' /* Char to sep. names */ -#ifdef MSDOS -#define EXTRA_FIELD_CHAR (char) '\234' /* Interchangebly with '#' */ -#else -#define EXTRA_FIELD_CHAR '#' /* Interchangebly with '#' */ -#endif #define READ_RECORD_BUFFER (uint) (IO_SIZE*8) /* Pointer_buffer_size */ #define DISK_BUFFER_SIZE (uint) (IO_SIZE*16) /* Size of diskbuffer */ |