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_preload.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_preload.c')
| -rw-r--r-- | storage/maria/ma_preload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_preload.c b/storage/maria/ma_preload.c index fc818b5b277..44fc12f8571 100644 --- a/storage/maria/ma_preload.c +++ b/storage/maria/ma_preload.c @@ -94,7 +94,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) (byte*) buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, - PAGECACHE_PIN_LEFT_PINNED, + PAGECACHE_PIN_LEFT_UNPINNED, PAGECACHE_WRITE_DONE, 0)) goto err; } @@ -111,7 +111,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) (byte*) buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, - PAGECACHE_PIN_LEFT_PINNED, + PAGECACHE_PIN_LEFT_UNPINNED, PAGECACHE_WRITE_DONE, 0)) goto err; pos+= length; |