← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tztime.cc

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tztime.cc
17
17
#pragma implementation                          // gcc: Class implementation
18
18
#endif
19
19
 
20
 
#include <my_global.h>
21
20
#include "mysql_priv.h"
22
 
#include <my_time.h>
 
21
#include <libdrizzle/my_time.h>
23
22
 
24
23
#include "tzfile.h"
25
 
#include <m_string.h>
26
24
 
27
25
/* Structure describing local time type (e.g. Moscow summer time (MSD)) */
28
26
typedef struct ttinfo
725
723
    0
726
724
*/
727
725
my_time_t
728
 
Time_zone_utc::TIME_to_gmt_sec(const MYSQL_TIME *t __attribute__((__unused__)),
729
 
                               bool *in_dst_time_gap __attribute__((__unused__))) const
 
726
Time_zone_utc::TIME_to_gmt_sec(const MYSQL_TIME *t __attribute__((unused)),
 
727
                               bool *in_dst_time_gap __attribute__((unused))) const
730
728
{
731
729
  /* Should be never called */
732
730
  assert(0);
938
936
*/
939
937
my_time_t
940
938
Time_zone_offset::TIME_to_gmt_sec(const MYSQL_TIME *t,
941
 
                                  bool *in_dst_time_gap __attribute__((__unused__))) const
 
939
                                  bool *in_dst_time_gap __attribute__((unused))) const
942
940
{
943
941
  my_time_t local_t;
944
942
  int shift= 0;
1052
1050
*/
1053
1051
bool
1054
1052
my_tz_init(THD *thd, const char *default_tzname,
1055
 
           bool bootstrap __attribute__((__unused__)))
 
1053
           bool bootstrap __attribute__((unused)))
1056
1054
{
1057
1055
  if (default_tzname)
1058
1056
  {
1170
1168
 
1171
1169
*/
1172
1170
Time_zone *
1173
 
my_tz_find(THD *thd __attribute__((__unused__)),
1174
 
           const String *name __attribute__((__unused__)))
 
1171
my_tz_find(THD *thd __attribute__((unused)),
 
1172
           const String *name __attribute__((unused)))
1175
1173
{
1176
1174
  return NULL;
1177
1175
}