diff options
author | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-10 18:22:14 +0200 |
commit | c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393 (patch) | |
tree | e653ab85c004942486ac67e01503e235b0a37894 /include | |
parent | 2031478ad9792cb0694108d461eaa1efa8f1d31c (diff) | |
parent | d6ae6b017bb73b55bc6b22575031a3a8e7b75d41 (diff) | |
download | mariadb-git-c20a4e6e026bdb4f5aed1402ea582ce4a2c5a393.tar.gz |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
include/my_global.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
-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 5ba9b705660..6f33e570ba3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -454,7 +454,6 @@ typedef SOCKET_SIZE_TYPE size_socket; /* Some things that this system doesn't have */ #define ONLY_OWN_DATABASES /* We are using only databases by monty */ -#define HAVE_ISAM /* TO BE DELETED */ #define NO_HASH /* Not needed anymore */ #ifdef __WIN__ #define NO_DIR_LIBRARY /* Not standar dir-library */ |