diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-18 18:08:05 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-18 18:08:05 +0300 |
| commit | 155eb4658d3c238d2d27e6ca9f7e0ef91cf045b5 (patch) | |
| tree | 4b381cc5c16db4d16c61f027536c838bd060248d /storage/heap | |
| parent | c9b88730e4999f88ea19fea8a100b08ae8bfad85 (diff) | |
| download | mariadb-git-155eb4658d3c238d2d27e6ca9f7e0ef91cf045b5.tar.gz | |
5.0-opt -> 5.1-opt merge
Diffstat (limited to 'storage/heap')
| -rw-r--r-- | storage/heap/ha_heap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 5d34395fa5a..f2b67f20c57 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -136,8 +136,8 @@ int ha_heap::close(void) handler *ha_heap::clone(MEM_ROOT *mem_root) { - handler *new_handler= get_new_handler(table, mem_root, table->s->db_type); - if (new_handler && !new_handler->ha_open(file->s->name, table->db_stat, + handler *new_handler= get_new_handler(table->s, mem_root, table->s->db_type()); + if (new_handler && !new_handler->ha_open(table, file->s->name, table->db_stat, HA_OPEN_IGNORE_IF_LOCKED)) return new_handler; return NULL; /* purecov: inspected */ |