Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
ChangeSet@stripped, 2007-07-18 16:15:50+04:00, kaa@stripped +1 -0
Since it was decided to not fix bug #5731 and related ones in 5.0, we need to limit all buffer sizes to 4GB on all platforms. This patch will be null-merged to 5.1.
sql/mysqld.cc@stripped, 2007-07-18 16:15:47+04:00, kaa@stripped +4 -4
Limit join_buffer_size, key_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB on all platforms.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kaa
# Host: polly.local
# Root: /home/kaa/src/maint/bug5731/my50-bug5731
--- 1.596/sql/mysqld.cc 2007-02-06 16:43:58 +03:00
+++ 1.597/sql/mysqld.cc 2007-07-18 16:15:47 +04:00
@@ -5691,14 +5691,14 @@ log and this option does nothing anymore
"The size of the buffer that is used for full joins.",
(gptr*) &max_system_variables.join_buff_size, 0, GET_ULONG,
- REQUIRED_ARG, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD,
+ REQUIRED_ARG, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, UINT_MAX32, MALLOC_OVERHEAD,
"The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.",
0, (GET_ULL | GET_ASK_ADDR),
- REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, MALLOC_OVERHEAD,
+ REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, UINT_MAX32, MALLOC_OVERHEAD,
"This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache",
@@ -5855,7 +5855,7 @@ The minimum value for this variable is 4
"The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.",
(gptr*) &max_system_variables.myisam_sort_buff_size, 0,
- GET_ULONG, REQUIRED_ARG, 8192*1024, 4, ~0L, 0, 1, 0},
+ GET_ULONG, REQUIRED_ARG, 8192*1024, 4, UINT_MAX32, 0, 1, 0},
"Specifies how MyISAM index statistics collection code should threat NULLs. "
"Possible values of name are \"nulls_unequal\" (default behavior for 4.1/5.0), "
@@ -6001,7 +6001,7 @@ The minimum value for this variable is 4
"Each thread that needs to do a sort allocates a buffer of this size.",
(gptr*) &max_system_variables.sortbuff_size, 0, GET_ULONG, REQUIRED_ARG,
- MAX_SORT_MEMORY, MIN_SORT_MEMORY+MALLOC_OVERHEAD*2, ~0L, MALLOC_OVERHEAD,
+ MAX_SORT_MEMORY, MIN_SORT_MEMORY+MALLOC_OVERHEAD*2, UINT_MAX32, MALLOC_OVERHEAD,
|• bk commit into 5.0 tree (kaa:1.2404) BUG#5731||Alexey Kopytov||18 Jul|