diff options
author | Jan Lindström <jplindst@mariadb.org> | 2013-11-25 17:14:08 +0200 |
---|---|---|
committer | Jan Lindström <jplindst@mariadb.org> | 2013-11-25 17:14:08 +0200 |
commit | 071edcfea05674f86926ee4c5fbf30f97c2ed368 (patch) | |
tree | c33fbb7c8bc5d568650226c8d71496a3d47bc10c /storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc | |
parent | 4f85baab95f50448930a8c9915f7178aa121e66e (diff) | |
parent | 160236f880e92d2872d95ce72aab144f08456bcc (diff) | |
download | mariadb-git-071edcfea05674f86926ee4c5fbf30f97c2ed368.tar.gz |
Merge with MariaDB 5.5.34.
Diffstat (limited to 'storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc')
-rw-r--r-- | storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc b/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc index fec7153265a..8691e2b93b0 100644 --- a/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc +++ b/storage/tokudb/ft-index/ft/tests/cachetable-put-checkpoint.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: @@ -554,6 +555,7 @@ cachetable_test (void) { NULL, &dummy_log_fassociate, &dummy_close_usr, + &dummy_free_usr, &dummy_chckpnt_usr, test_begin_checkpoint, // called in begin_checkpoint &dummy_end, |