Automatic merge
Fixed compiler warning client/mysql.cc: Fixed compiler warning include/my_global.h: Fixed typo storage/maria/ha_maria.cc: Merge
This commit is contained in:
commit
a826711789
@ -1883,7 +1883,7 @@ static int read_and_execute(bool interactive)
|
||||
String buffer;
|
||||
#endif
|
||||
|
||||
char *line;
|
||||
char *line= 0;
|
||||
char in_string=0;
|
||||
ulong line_number=0;
|
||||
bool ml_comment= 0;
|
||||
|
@ -799,10 +799,10 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
||||
#endif
|
||||
/* get memory in huncs */
|
||||
#define ONCE_ALLOC_INIT (uint) (4096-MALLOC_OVERHEAD)
|
||||
/* Typical record cash */
|
||||
#define RECORD_CACHE_SIZE (uint) (64*1024-MALLOC_OVERHEAD)
|
||||
/* Typical key cash */
|
||||
#define KEY_CACHE_SIZE (uint) (8*1024*1024-MALLOC_OVERHEAD)
|
||||
/* Typical record cache */
|
||||
#define RECORD_CACHE_SIZE (uint) (128*1024-MALLOC_OVERHEAD)
|
||||
/* Typical key cache */
|
||||
#define KEY_CACHE_SIZE (uint) (128L*1024L*1024L-MALLOC_OVERHEAD)
|
||||
/* Default size of a key cache block */
|
||||
#define KEY_CACHE_BLOCK_SIZE (uint) 1024
|
||||
|
||||
|
@ -212,7 +212,7 @@ static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG,
|
||||
static MYSQL_THDVAR_ULONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG,
|
||||
"The buffer that is allocated when sorting the index when doing a "
|
||||
"REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.",
|
||||
0, 0, 8192*1024, 4, ~0L, 1);
|
||||
0, 0, 128L*1024L*1024L, 4, ~0L, 1);
|
||||
|
||||
static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG,
|
||||
"Specifies how maria index statistics collection code should treat "
|
||||
|
Loading…
x
Reference in New Issue
Block a user