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 | 0d857c2c84376a976410c9ee2474d7abcd2336f2 (patch) | |
| tree | fa51d3c04c53ac900a866138d59e1b6796fe2d52 /storage/myisam/ha_myisam.cc | |
| parent | 2f972fef46de74ecab999879421f42b2d67609f4 (diff) | |
| parent | 482c0b7d421aa3f4eec2c3ca49be4ce3795fe191 (diff) | |
| download | mariadb-git-0d857c2c84376a976410c9ee2474d7abcd2336f2.tar.gz | |
Manual merge from 5.1
Diffstat (limited to 'storage/myisam/ha_myisam.cc')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 16457088f9c..428601b7f6f 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -643,9 +643,10 @@ ha_myisam::ha_myisam(handlerton *hton, TABLE_SHARE *table_arg) can_enable_indexes(1) {} -handler *ha_myisam::clone(MEM_ROOT *mem_root) +handler *ha_myisam::clone(const char *name, MEM_ROOT *mem_root) { - ha_myisam *new_handler= static_cast <ha_myisam *>(handler::clone(mem_root)); + ha_myisam *new_handler= static_cast <ha_myisam *>(handler::clone(name, + mem_root)); if (new_handler) new_handler->file->state= file->state; return new_handler; |