diff options
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | include/my_global.h | 8 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 39ca04ccbb9..feb2a19e4f2 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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; diff --git a/include/my_global.h b/include/my_global.h index b4579248dfa..7fc0f9250e0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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 diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index bbfe2c3ccbb..1bac89b222c 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -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 " |