mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged

Browse source
This commit is contained in:
serg@serg.mysql.com 2002-03-21 18:18:53 +00:00
commit 48a967696f
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Docs/manual.texi
View file

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

6
include/myisam.h
View file

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

4
sql/sql_yacc.yy
View file

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