diff options
| author | John Esmet <esmet@tokutek.com> | 2012-11-12 00:43:22 +0000 |
|---|---|---|
| committer | Yoni Fogel <yoni@tokutek.com> | 2013-04-17 00:01:15 -0400 |
| commit | 9e4b3509ecbba7c2d8b169b2feae007601d294c0 (patch) | |
| tree | 5b4404249fcbba841aa8e155741e2aeb9b1819be /util | |
| parent | 248d4480813f466c1fa76cf70f4ab9c16c29e0ef (diff) | |
| download | mariadb-git-9e4b3509ecbba7c2d8b169b2feae007601d294c0.tar.gz | |
fixes #5351 fixes #5528 merge the new locktree to main. the locktree, locktree manager, and blocking lock request api are implemented at the toplevel under locktree/ and the ydb layer has been modified to use the new API. some kruft has been deleted from various parts of the source tree and these merge also includes a change where we kill 'includes.h'
git-svn-id: file:///svn/toku/tokudb@49851 c7de825b-a66e-492c-adef-691d508d4ae1
Diffstat (limited to 'util')
| -rw-r--r-- | util/growable_array.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/growable_array.h b/util/growable_array.h index cb46a292817..07afd249eb7 100644 --- a/util/growable_array.h +++ b/util/growable_array.h @@ -6,6 +6,8 @@ #ident "Copyright (c) 2007-2012 Tokutek Inc. All rights reserved." #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it." +#include <memory.h> + //****************************************************************************** // // Overview: A growable array is a little bit like std::vector except that |