diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-03 19:10:10 +0300 |
| commit | 1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (patch) | |
| tree | 17ba1ed90233efa64bc83364ed1ffb74dd637ead /sql/handler.h | |
| parent | ce55d37929fc91b476541d3a77336a44b20317ac (diff) | |
| parent | 90e058e0c623f770ee602ebab86e91303f08c90a (diff) | |
| download | mariadb-git-1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 270c7bb0be2..32112fdcd13 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -23,7 +23,6 @@ #pragma interface /* gcc class implementation */ #endif -#include <my_handler.h> #include <ft_global.h> #include <keycache.h> @@ -1306,7 +1305,7 @@ public: DBUG_ASSERT(locked == FALSE); /* TODO: DBUG_ASSERT(inited == NONE); */ } - virtual handler *clone(MEM_ROOT *mem_root); + virtual handler *clone(const char *name, MEM_ROOT *mem_root); /** This is called after create to allow us to set up cached variables */ void init() { |