Commit 48a96769 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

merged

parents a36bb38b b6a88cec

Docs/manual.texi

+1 −2
Original line number Diff line number Diff line
@@ -18019,8 +18019,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

full-text keys in the table.

temporary files should be very big.















@item --character-sets-dir=...















Directory where character sets are stored.

























include/myisam.h



+6
−0






























Original line number
Diff line number
Diff line








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

































sql/sql_yacc.yy



+2
−2






























Original line number
Diff line number
Diff line








@@ -1326,7 +1326,7 @@ mi_repair_types:













mi_repair_type:















	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