← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2010-08-13 18:47:12 UTC
  • mfrom: (1703.1.4 staging)
  • Revision ID: brian@tangent.org-20100813184712-rx8hjq33powaaqlv
Merge MyISAM changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
52
52
 
53
53
static const string engine_name("MyISAM");
54
54
 
55
 
pthread_mutex_t THR_LOCK_myisam= PTHREAD_MUTEX_INITIALIZER;
 
55
boost::mutex THR_LOCK_myisam;
56
56
 
57
57
static uint32_t myisam_key_cache_block_size= KEY_CACHE_BLOCK_SIZE;
58
58
static uint32_t myisam_key_cache_size;
97
97
                          HTON_AUTO_PART_KEY |
98
98
                          HTON_SKIP_STORE_LOCK)
99
99
  {
100
 
    pthread_mutex_init(&THR_LOCK_myisam,MY_MUTEX_INIT_FAST);
101
100
  }
102
101
 
103
102
  virtual ~MyisamEngine()
104
103
  { 
105
 
    pthread_mutex_destroy(&THR_LOCK_myisam);
106
 
 
107
104
    mi_panic(HA_PANIC_CLOSE);
108
105
  }
109
106
 
1531
1528
                                N_("The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE."),
1532
1529
                                NULL, NULL, 8192*1024, 1024, SIZE_MAX, 0);
1533
1530
 
1534
 
extern uint32_t data_pointer_size;
1535
 
static DRIZZLE_SYSVAR_UINT(data_pointer_size, data_pointer_size,
1536
 
                            PLUGIN_VAR_RQCMDARG,
1537
 
                            N_("Default pointer size to be used for MyISAM tables."),
1538
 
                            NULL, NULL, 6, 2, 7, 0);
1539
 
 
1540
1531
static void init_options(drizzled::module::option_context &context)
1541
1532
{
1542
1533
  context("max-sort-file-size",
1545
1536
  context("sort-buffer-size",
1546
1537
          po::value<uint64_t>(&sort_buffer_size)->default_value(8192*1024),
1547
1538
          N_("The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE."));
1548
 
  context("data-pointer-size",
1549
 
          po::value<uint32_t>(&data_pointer_size)->default_value(6),
1550
 
          N_("Default pointer size to be used for MyISAM tables."));
1551
1539
}
1552
1540
 
1553
1541
static drizzle_sys_var* sys_variables[]= {
1554
1542
  DRIZZLE_SYSVAR(max_sort_file_size),
1555
1543
  DRIZZLE_SYSVAR(sort_buffer_size),
1556
 
  DRIZZLE_SYSVAR(data_pointer_size),
1557
1544
  NULL
1558
1545
};
1559
1546