~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-02-26 05:21:02 UTC
  • mfrom: (896.1.5 fix-osxs)
  • Revision ID: brian@intel-mini-2.local-20090226052102-8xtbjt8kph6mi0qx
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
static int open_unireg_entry(Session *session, Table *entry, TableList *table_list,
62
62
                             const char *alias,
63
63
                             char *cache_key, uint32_t cache_key_length);
64
 
static void free_cache_entry(void *entry);
 
64
extern "C" void free_cache_entry(void *entry);
65
65
static void close_old_data_files(Session *session, Table *table, bool morph_locks,
66
66
                                 bool send_refresh);
67
67
 
77
77
 
78
78
bool table_cache_init(void)
79
79
{
80
 
  return hash_init(&open_cache, &my_charset_bin, table_cache_size+16,
 
80
  return hash_init(&open_cache, &my_charset_bin,
 
81
                   (size_t) table_cache_size+16,
81
82
                   0, 0, table_cache_key,
82
83
                   free_cache_entry, 0);
83
84
}
179
180
  oldest_unused_share= &end_of_unused_share;
180
181
  end_of_unused_share.prev= &oldest_unused_share;
181
182
 
182
 
  return hash_init(&table_def_cache, &my_charset_bin, table_def_size,
 
183
  return hash_init(&table_def_cache, &my_charset_bin, (size_t)table_def_size,
183
184
                   0, 0, table_def_key,
184
185
                   (hash_free_key) table_def_free_entry, 0);
185
186
}
604
605
    We need to have a lock on LOCK_open when calling this
605
606
*/
606
607
 
607
 
static void free_cache_entry(void *entry)
 
608
void free_cache_entry(void *entry)
608
609
{
609
610
  Table *table= static_cast<Table *>(entry);
610
611
  intern_close_table(table);