diff options
| author | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
| commit | cab1dc628c116f042a3fd8dbc505f7ca2df599a3 (patch) | |
| tree | 0a23d90c946c5f05a8c160fc7c6ef3f05505fc79 /myisam/mi_page.c | |
| parent | f277c9f88a4a2e392e44cfdb6b3f4785b6c730d0 (diff) | |
| download | mariadb-git-cab1dc628c116f042a3fd8dbc505f7ca2df599a3.tar.gz | |
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
Diffstat (limited to 'myisam/mi_page.c')
| -rw-r--r-- | myisam/mi_page.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/myisam/mi_page.c b/myisam/mi_page.c index 72aaac5d381..0aae267e05e 100644 --- a/myisam/mi_page.c +++ b/myisam/mi_page.c @@ -32,7 +32,7 @@ uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo, DBUG_ENTER("_mi_fetch_keypage"); DBUG_PRINT("enter",("page: %ld",page)); - tmp=(uchar*) key_cache_read(*info->s->keycache, + tmp=(uchar*) key_cache_read(*info->s->key_cache, info->s->kfile, page, level, (byte*) buff, (uint) keyinfo->block_length, (uint) keyinfo->block_length, @@ -52,6 +52,7 @@ uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo, { DBUG_PRINT("error",("page %lu had wrong page length: %u", (ulong) page, page_size)); + DBUG_DUMP("page", tmp, keyinfo->block_length); info->last_keypage = HA_OFFSET_ERROR; my_errno = HA_ERR_CRASHED; tmp = 0; @@ -94,7 +95,7 @@ int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo, length=keyinfo->block_length; } #endif - DBUG_RETURN((key_cache_write(*info->s->keycache, + DBUG_RETURN((key_cache_write(*info->s->key_cache, info->s->kfile,page, level, (byte*) buff,length, (uint) keyinfo->block_length, (int) ((info->lock_type != F_UNLCK) || @@ -116,7 +117,7 @@ int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t pos, info->s->state.key_del[keyinfo->block_size]=pos; mi_sizestore(buff,old_link); info->s->state.changed|= STATE_NOT_SORTED_PAGES; - DBUG_RETURN(key_cache_write(*info->s->keycache, + DBUG_RETURN(key_cache_write(*info->s->key_cache, info->s->kfile, pos , level, buff, sizeof(buff), (uint) keyinfo->block_length, @@ -145,7 +146,7 @@ my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level) } else { - if (!key_cache_read(*info->s->keycache, + if (!key_cache_read(*info->s->key_cache, info->s->kfile, pos, level, buff, (uint) sizeof(buff), |