mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg include/keycache.h: Auto merged mysql-test/r/key_cache.result: Auto merged sql/mysqld.cc: Auto merged mysys/mf_keycache.c: SCCS merged
This commit is contained in:
unknown
commit
edd98ca5db
5 changed files with 60 additions and 8 deletions
|
|
@ -47,7 +47,6 @@ typedef struct st_key_cache
|
|||
my_bool in_resize; /* true during resize operation */
|
||||
my_bool resize_in_flush; /* true during flush of resize operation */
|
||||
my_bool can_be_used; /* usage of cache for read/write is allowed */
|
||||
uint key_cache_shift;
|
||||
ulong key_cache_mem_size; /* specified size of the cache memory */
|
||||
uint key_cache_block_size; /* size of the page buffer of a cache block */
|
||||
ulong min_warm_blocks; /* min number of warm blocks; */
|
||||
|
|
|
|||
|
|
@ -341,3 +341,30 @@ Warning 1438 Cannot drop default keycache
|
|||
select @@global.key_buffer_size;
|
||||
@@global.key_buffer_size
|
||||
2097152
|
||||
SET @bug28478_key_cache_block_size= @@global.key_cache_block_size;
|
||||
SET GLOBAL key_cache_block_size= 1536;
|
||||
CREATE TABLE t1 (
|
||||
id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
c1 CHAR(150),
|
||||
c2 CHAR(150),
|
||||
c3 CHAR(150),
|
||||
KEY(c1, c2, c3)
|
||||
) ENGINE= MyISAM;
|
||||
INSERT INTO t1 (c1, c2, c3) VALUES
|
||||
('a', 'b', 'c'), ('b', 'c', 'd'), ('c', 'd', 'e'), ('d', 'e', 'f'),
|
||||
('e', 'f', 'g'), ('f', 'g', 'h'), ('g', 'h', 'i'), ('h', 'i', 'j'),
|
||||
('i', 'j', 'k'), ('j', 'k', 'l'), ('k', 'l', 'm'), ('l', 'm', 'n'),
|
||||
('m', 'n', 'o'), ('n', 'o', 'p'), ('o', 'p', 'q'), ('p', 'q', 'r'),
|
||||
('q', 'r', 's'), ('r', 's', 't'), ('s', 't', 'u'), ('t', 'u', 'v'),
|
||||
('u', 'v', 'w'), ('v', 'w', 'x'), ('w', 'x', 'y'), ('x', 'y', 'z');
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
CHECK TABLE t1;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 check status OK
|
||||
SHOW VARIABLES LIKE 'key_cache_block_size';
|
||||
Variable_name Value
|
||||
key_cache_block_size 1536
|
||||
SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
|
||||
DROP TABLE t1;
|
||||
|
|
|
|||
|
|
@ -219,4 +219,31 @@ set global key_cache_block_size= @my_key_cache_block_size;
|
|||
set @@global.key_buffer_size=0;
|
||||
select @@global.key_buffer_size;
|
||||
|
||||
#
|
||||
# Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables
|
||||
#
|
||||
SET @bug28478_key_cache_block_size= @@global.key_cache_block_size;
|
||||
SET GLOBAL key_cache_block_size= 1536;
|
||||
CREATE TABLE t1 (
|
||||
id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
||||
c1 CHAR(150),
|
||||
c2 CHAR(150),
|
||||
c3 CHAR(150),
|
||||
KEY(c1, c2, c3)
|
||||
) ENGINE= MyISAM;
|
||||
INSERT INTO t1 (c1, c2, c3) VALUES
|
||||
('a', 'b', 'c'), ('b', 'c', 'd'), ('c', 'd', 'e'), ('d', 'e', 'f'),
|
||||
('e', 'f', 'g'), ('f', 'g', 'h'), ('g', 'h', 'i'), ('h', 'i', 'j'),
|
||||
('i', 'j', 'k'), ('j', 'k', 'l'), ('k', 'l', 'm'), ('l', 'm', 'n'),
|
||||
('m', 'n', 'o'), ('n', 'o', 'p'), ('o', 'p', 'q'), ('p', 'q', 'r'),
|
||||
('q', 'r', 's'), ('r', 's', 't'), ('s', 't', 'u'), ('t', 'u', 'v'),
|
||||
('u', 'v', 'w'), ('v', 'w', 'x'), ('w', 'x', 'y'), ('x', 'y', 'z');
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
INSERT INTO t1 (c1, c2, c3) SELECT c1, c2, c3 from t1;
|
||||
CHECK TABLE t1;
|
||||
SHOW VARIABLES LIKE 'key_cache_block_size';
|
||||
SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
|
||||
DROP TABLE t1;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ static void test_key_cache(KEY_CACHE *keycache,
|
|||
#endif
|
||||
|
||||
#define KEYCACHE_HASH(f, pos) \
|
||||
(((ulong) ((pos) >> keycache->key_cache_shift)+ \
|
||||
(((ulong) ((pos) / keycache->key_cache_block_size) + \
|
||||
(ulong) (f)) & (keycache->hash_entries-1))
|
||||
#define FILE_HASH(f) ((uint) (f) & (CHANGED_BLOCKS_HASH-1))
|
||||
|
||||
|
|
@ -399,7 +399,6 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
|
|||
|
||||
keycache->key_cache_mem_size= use_mem;
|
||||
keycache->key_cache_block_size= key_cache_block_size;
|
||||
keycache->key_cache_shift= my_bit_log2(key_cache_block_size);
|
||||
DBUG_PRINT("info", ("key_cache_block_size: %u",
|
||||
key_cache_block_size));
|
||||
|
||||
|
|
@ -422,7 +421,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
|
|||
ALIGN_SIZE(hash_links * sizeof(HASH_LINK)) +
|
||||
ALIGN_SIZE(sizeof(HASH_LINK*) *
|
||||
keycache->hash_entries))) +
|
||||
((ulong) blocks << keycache->key_cache_shift) > use_mem)
|
||||
((ulong) blocks * keycache->key_cache_block_size) > use_mem)
|
||||
blocks--;
|
||||
/* Allocate memory for cache page buffers */
|
||||
if ((keycache->block_mem=
|
||||
|
|
@ -2558,7 +2557,7 @@ uchar *key_cache_read(KEY_CACHE *keycache,
|
|||
inc_counter_for_resize_op(keycache);
|
||||
locked_and_incremented= TRUE;
|
||||
/* Requested data may not always be aligned to cache blocks. */
|
||||
offset= (uint) (filepos & (keycache->key_cache_block_size-1));
|
||||
offset= (uint) (filepos % keycache->key_cache_block_size);
|
||||
/* Read data in key_cache_block_size increments */
|
||||
do
|
||||
{
|
||||
|
|
@ -2756,7 +2755,7 @@ int key_cache_insert(KEY_CACHE *keycache,
|
|||
inc_counter_for_resize_op(keycache);
|
||||
locked_and_incremented= TRUE;
|
||||
/* Loaded data may not always be aligned to cache blocks. */
|
||||
offset= (uint) (filepos & (keycache->key_cache_block_size-1));
|
||||
offset= (uint) (filepos % keycache->key_cache_block_size);
|
||||
/* Load data in key_cache_block_size increments. */
|
||||
do
|
||||
{
|
||||
|
|
@ -3030,7 +3029,7 @@ int key_cache_write(KEY_CACHE *keycache,
|
|||
inc_counter_for_resize_op(keycache);
|
||||
locked_and_incremented= TRUE;
|
||||
/* Requested data may not always be aligned to cache blocks. */
|
||||
offset= (uint) (filepos & (keycache->key_cache_block_size-1));
|
||||
offset= (uint) (filepos % keycache->key_cache_block_size);
|
||||
/* Write data in key_cache_block_size increments. */
|
||||
do
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5910,7 +5910,7 @@ log and this option does nothing anymore.",
|
|||
(uchar**) &dflt_key_cache_var.param_block_size,
|
||||
(uchar**) 0,
|
||||
0, (GET_ULONG | GET_ASK_ADDR), REQUIRED_ARG,
|
||||
KEY_CACHE_BLOCK_SIZE , 512, 1024*16, MALLOC_OVERHEAD, 512, 0},
|
||||
KEY_CACHE_BLOCK_SIZE, 512, 1024 * 16, 0, 512, 0},
|
||||
{"key_cache_division_limit", OPT_KEY_CACHE_DIVISION_LIMIT,
|
||||
"The minimum percentage of warm blocks in key cache",
|
||||
(uchar**) &dflt_key_cache_var.param_division_limit,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue