diff options
| author | unknown <bell@desktop.sanja.is.com.ua> | 2007-04-18 12:55:09 +0300 |
|---|---|---|
| committer | unknown <bell@desktop.sanja.is.com.ua> | 2007-04-18 12:55:09 +0300 |
| commit | 92e99ce4243b5ffdc069f1681136e858e888d646 (patch) | |
| tree | ee641f21e3f36205cd41f0baa6286d5d1b60d601 /storage/maria/ma_page.c | |
| parent | e10fe77b0ac9a43ad795555c65391318ff7cc968 (diff) | |
| download | mariadb-git-92e99ce4243b5ffdc069f1681136e858e888d646.tar.gz | |
Postmerge fixes.
added forgoten file.
The patch broke maria.test (will be fixed later)
sql/handler.cc:
Pagecache block should be equal maria block.
sql/mysqld.cc:
parameters Fixed.
storage/maria/ma_bitmap.c:
fixed typo.
storage/maria/ma_blockrec.c:
fixed typo.
storage/maria/ma_delete_all.c:
fixed typo.
storage/maria/ma_page.c:
fixed typo.
storage/maria/ma_pagecache.c:
pin/lock debugging protection activated by default.
storage/maria/ma_pagecaches.c:
parameters Fixed.
storage/maria/ma_preload.c:
fixed typo.
mysys/my_safehash.c:
New BitKeeper file ``mysys/my_safehash.c''
Diffstat (limited to 'storage/maria/ma_page.c')
| -rw-r--r-- | storage/maria/ma_page.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ma_page.c b/storage/maria/ma_page.c index 5a037337882..03c8a787697 100644 --- a/storage/maria/ma_page.c +++ b/storage/maria/ma_page.c @@ -97,7 +97,7 @@ int _ma_write_keypage(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo, &info->s->kfile, page / keyinfo->block_length, level, buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, - PAGECACHE_PIN_LEFT_PINNED, + PAGECACHE_PIN_LEFT_UNPINNED, PAGECACHE_WRITE_DELAY, 0)); } /* maria_write_keypage */ @@ -131,7 +131,7 @@ int _ma_dispose(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, my_off_t pos, &info->s->kfile, page_no, level, buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, - PAGECACHE_PIN_LEFT_PINNED, + PAGECACHE_PIN_LEFT_UNPINNED, PAGECACHE_WRITE_DELAY, 0, offset, sizeof(buff))); } /* _ma_dispose */ @@ -142,7 +142,7 @@ int _ma_dispose(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, my_off_t pos, my_off_t _ma_new(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, int level) { my_off_t pos; - byte buff[8]; + byte *buff; DBUG_ENTER("_ma_new"); if ((pos= info->s->state.key_del) == HA_OFFSET_ERROR) @@ -158,6 +158,7 @@ my_off_t _ma_new(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, int level) } else { + buff= alloca(info->s->block_size); DBUG_ASSERT(info->s->pagecache->block_size == keyinfo->block_length && info->s->pagecache->block_size == info->s->block_size); /* |