1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2002-02-14 18:58:24 +02:00
22 changed files with 213 additions and 61 deletions

View File

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