diff options
| author | unknown <guilhem@gbichot4.local> | 2008-01-29 22:21:59 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-01-29 22:21:59 +0100 |
| commit | 3563311bfd415c3bcad7dd2a217742b0f57278e5 (patch) | |
| tree | f750fa913fa7cbbe0a7206572cf070ee64a6c5ea /storage/maria/ma_loghandler.c | |
| parent | e89cc6064eb3a2a93ef218a675b0924ccf45c9c2 (diff) | |
| parent | 2fcff8988aee4f444ed30b3248a60b7ed357bd6c (diff) | |
| download | mariadb-git-3563311bfd415c3bcad7dd2a217742b0f57278e5.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into gbichot4.local:/home/mysql_src/mysql-maria-monty
mysql-test/t/maria-recovery.test:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
Diffstat (limited to 'storage/maria/ma_loghandler.c')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 9cde974d581..768ce10ed13 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -616,7 +616,7 @@ static LOG_DESC INIT_LOGREC_INCOMPLETE_GROUP= static LOG_DESC INIT_LOGREC_UNDO_BULK_INSERT= {LOGRECTYPE_VARIABLE_LENGTH, 0, LSN_STORE_SIZE + FILEID_STORE_SIZE, - NULL, write_hook_for_undo, NULL, 1, + NULL, write_hook_for_undo_bulk_insert, NULL, 1, "undo_bulk_insert", LOGREC_LAST_IN_GROUP, NULL, NULL}; static LOG_DESC INIT_LOGREC_REDO_BITMAP_NEW_PAGE= |