diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | f34be1893892745b5b1a7a099eab4ad8e9ac8641 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/handler.h | |
| parent | e843297d128b165125d17aab8958f7ca91808923 (diff) | |
| parent | 8882d71f3f1dd03ef98d072def39b29e6a03f5b8 (diff) | |
| download | mariadb-git-f34be1893892745b5b1a7a099eab4ad8e9ac8641.tar.gz | |
Merge with MariaDB 5.2
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 f674a8a56bb..59d6aaf4b7f 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> @@ -1670,7 +1669,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() { |