diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-11-14 19:57:58 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-11-14 19:57:58 +0200 |
| commit | 422375fc1bce1ea6ffb9226cfdef02c6a05b2a0f (patch) | |
| tree | 5c22098e09c2798ab21267619936d62c2b014a54 /storage/maria/ma_preload.c | |
| parent | 21fd2a5a3656813c3d97760a5e7eef987dc6879d (diff) | |
| parent | 1bc5e3b971e4f9c11df8e1be83614188c242eefc (diff) | |
| download | mariadb-git-422375fc1bce1ea6ffb9226cfdef02c6a05b2a0f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_checkpoint.c:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_loghandler.h:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_pagecache.h:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/maria/unittest/ma_pagecache_single.c:
Auto merged
storage/maria/ma_blockrec.c:
Manual merge
storage/maria/ma_page.c:
Manual merge
storage/maria/ma_pagecache.c:
Manual merge
storage/maria/ma_preload.c:
Manual merge
storage/maria/ma_recovery.c:
Manual merge
Add _ma_unpin_all_pages() to all new UNDO redo_exec_hook's
Diffstat (limited to 'storage/maria/ma_preload.c')
| -rw-r--r-- | storage/maria/ma_preload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_preload.c b/storage/maria/ma_preload.c index b3a0b97a58f..f293b18213f 100644 --- a/storage/maria/ma_preload.c +++ b/storage/maria/ma_preload.c @@ -86,7 +86,8 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN_LEFT_UNPINNED, - PAGECACHE_WRITE_DONE, 0)) + PAGECACHE_WRITE_DONE, 0, + LSN_IMPOSSIBLE)) goto err; } pos+= block_length; |