From 104c51d745ab31ab38886855c085138c862aac49 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Mar 2002 10:50:55 +0000 Subject: [PATCH 1/2] obsolete note removed --- Docs/manual.texi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index f25a8746992..c5fa868dbab 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -17998,8 +17998,7 @@ If you have lots of memory, you should increase the size of @code{key_buffer_size}! @item -n or --sort-recover Force @code{myisamchk} to use sorting to resolve the keys even if the -temporary files should be very big. This will not have any effect if you have -fulltext keys in the table. +temporary files should be very big. @item --character-sets-dir=... Directory where character sets are stored. From b7ee7877e7bbf0130e1cac8a6ba42ffb56ada748 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Mar 2002 17:32:37 +0000 Subject: [PATCH 2/2] commit to pull --- include/myisam.h | 6 ++++++ sql/sql_yacc.yy | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/myisam.h b/include/myisam.h index c79bdbe14c8..0548db5994c 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -295,6 +295,12 @@ extern uint mi_get_pointer_length(ulonglong file_length, uint def); #define T_QUICK (1L << 30) #define T_RETRY_WITHOUT_QUICK (1L << 31) +/* flags used by myisamchk.c or/and ha_myisam.cc that do NOT passed + * to mi_check.c follows: + * */ + +#define TT_USEFRM 1 + #define O_NEW_INDEX 1 /* Bits set in out_flag */ #define O_NEW_DATA 2 #define O_DATA_LOST 4 diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 83a21b03ac4..e17171082ef 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1324,9 +1324,9 @@ mi_repair_types: | mi_repair_type mi_repair_types {} mi_repair_type: - QUICK { Lex->check_opt.flags|= T_QUICK; } + QUICK { Lex->check_opt.flags|= T_QUICK; } | EXTENDED_SYM { Lex->check_opt.flags|= T_EXTEND; } - | USE_FRM { /*Lex->check_opt.flags|= T_USEFRM;*/ } + | USE_FRM { Lex->check_opt.sql_flags|= TT_USEFRM; } analyze: ANALYZE_SYM table_or_tables