← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tztime.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tztime.cc
67
67
  uint32_t typecnt;  // Number of local time types
68
68
  uint32_t charcnt;  // Number of characters used for abbreviations
69
69
  uint32_t revcnt;   // Number of transition descr. for TIME->time_t conversion
70
 
  /* The following are dynamical arrays are allocated in MEM_ROOT */
 
70
  /* The following are dynamical arrays are allocated in memory::Root */
71
71
  time_t *ats;       // Times of transitions between time types
72
72
  unsigned char *types; // Local time types for transitions
73
73
  TRAN_TYPE_INFO *ttis; // Local time types descriptions
1010
1010
 
1011
1011
Time_zone *my_tz_SYSTEM= &tz_SYSTEM;
1012
1012
 
1013
 
class Tz_names_entry: public Sql_alloc
 
1013
class Tz_names_entry: public drizzled::memory::SqlAlloc
1014
1014
{
1015
1015
public:
1016
1016
  String name;