← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Monty Taylor
  • Date: 2010-11-08 18:26:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: mordred@inaugust.com-20101108182608-lci86acl7r53sbi3
Replaced auto_ptr with scoped_ptr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
21
21
#include <algorithm>
22
22
#include <memory>
23
23
#include <boost/scoped_ptr.hpp>
24
 
#include <boost/scoped_array.hpp>
25
24
 
26
 
#include <drizzled/charset_info.h>
27
 
#include <drizzled/internal/m_string.h>
28
 
#include <drizzled/util/test.h>
29
 
#include <drizzled/global_charset_info.h>
30
 
#include <drizzled/charset.h>
31
 
#include <drizzled/memory/multi_malloc.h>
 
25
#include "drizzled/charset_info.h"
 
26
#include "drizzled/internal/m_string.h"
 
27
#include "drizzled/util/test.h"
 
28
#include "drizzled/global_charset_info.h"
 
29
#include "drizzled/charset.h"
 
30
#include "drizzled/memory/multi_malloc.h"
32
31
 
33
32
 
34
33
using namespace std;
79
78
  have an open count of 0.
80
79
******************************************************************************/
81
80
 
82
 
MI_INFO *mi_open(const drizzled::identifier::Table &identifier, int mode, uint32_t open_flags)
 
81
MI_INFO *mi_open(const drizzled::TableIdentifier &identifier, int mode, uint32_t open_flags)
83
82
{
84
83
  int lock_error,kfile,open_mode,save_errno,have_rtree=0;
85
84
  uint32_t i,j,len,errpos,head_length,base_pos,offset,info_length,keys,
92
91
  boost::scoped_ptr<MYISAM_SHARE> share_buff_ap(new MYISAM_SHARE);
93
92
  MYISAM_SHARE &share_buff= *share_buff_ap.get();
94
93
  MYISAM_SHARE *share;
95
 
  boost::scoped_array<ulong> rec_per_key_part_ap(new ulong[HA_MAX_POSSIBLE_KEY*MI_MAX_KEY_SEG]);
 
94
  boost::scoped_ptr<ulong> rec_per_key_part_ap(new ulong[HA_MAX_POSSIBLE_KEY*MI_MAX_KEY_SEG]);
96
95
  ulong *rec_per_key_part= rec_per_key_part_ap.get();
97
96
  internal::my_off_t key_root[HA_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
98
97
  uint64_t max_key_file_length, max_data_file_length;