diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2011-04-20 19:53:08 +0200 |
| commit | f7b98c25f4569a04d2a6ad1cb294601b3d1bb658 (patch) | |
| tree | fa51d3c04c53ac900a866138d59e1b6796fe2d52 /sql/handler.h | |
| parent | 1d75aeb9a9175e3444594aea65e2a3760ce64baf (diff) | |
| parent | b3d86f12ebfbdd7cd053003ebe7657df66a07d45 (diff) | |
| download | mariadb-git-f7b98c25f4569a04d2a6ad1cb294601b3d1bb658.tar.gz | |
Manual merge from 5.1
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 911f7516e98..1250388f459 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1262,7 +1262,7 @@ public: DBUG_ASSERT(locked == FALSE); 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() { |