← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
52
52
#include "drizzled/pthread_globals.h"
53
53
#include "drizzled/internal/iocache.h"
54
54
 
55
 
 
56
55
using namespace std;
57
 
using namespace drizzled;
 
56
 
 
57
namespace drizzled
 
58
{
58
59
 
59
60
extern bool volatile shutdown_in_progress;
60
61
 
69
70
static int open_unireg_entry(Session *session, Table *entry, TableList *table_list,
70
71
                             const char *alias,
71
72
                             char *cache_key, uint32_t cache_key_length);
72
 
extern "C"
73
 
{
74
 
  void free_cache_entry(void *entry);
75
 
  unsigned char *table_cache_key(const unsigned char *record,
76
 
                                 size_t *length,
77
 
                                 bool );
78
 
}
79
 
 
 
73
void free_cache_entry(void *entry);
 
74
unsigned char *table_cache_key(const unsigned char *record,
 
75
                               size_t *length,
 
76
                               bool );
80
77
 
81
78
 
82
79
unsigned char *table_cache_key(const unsigned char *record,
208
205
 
209
206
    if (db && my_strcasecmp(system_charset_info, db, entry->s->db.str))
210
207
      continue;
211
 
    if (wild && wild_compare(entry->s->table_name.str, wild, 0))
 
208
    if (wild && internal::wild_compare(entry->s->table_name.str, wild, 0))
212
209
      continue;
213
210
 
214
211
    for (it= open_list.begin(); it < open_list.end(); it++)
4573
4570
  pthread_kill(signal_thread, SIGTERM);
4574
4571
  shutdown_in_progress= 1;                      // Safety if kill didn't work
4575
4572
}
 
4573
 
 
4574
} /* namespace drizzled */