← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tztime.cc

Merged in recent devel tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tztime.cc
1017
1017
 
1018
1018
  SYNOPSIS
1019
1019
    my_tz_init()
1020
 
      thd            - current thread object
 
1020
      session            - current thread object
1021
1021
      default_tzname - default time zone or 0 if none.
1022
1022
      bootstrap      - indicates whenever we are in bootstrap mode
1023
1023
 
1038
1038
    1 - Error
1039
1039
*/
1040
1040
bool
1041
 
my_tz_init(THD *thd, const char *default_tzname)
 
1041
my_tz_init(Session *session, const char *default_tzname)
1042
1042
{
1043
1043
  if (default_tzname)
1044
1044
  {
1048
1048
      most of them once more, but this is OK for system tables open
1049
1049
      for READ.
1050
1050
    */
1051
 
    if (!(global_system_variables.time_zone= my_tz_find(thd, &tmp_tzname2)))
 
1051
    if (!(global_system_variables.time_zone= my_tz_find(session, &tmp_tzname2)))
1052
1052
    {
1053
1053
      sql_print_error(_("Fatal error: Illegal or unknown default time zone '%s'"),
1054
1054
                      default_tzname);
1156
1156
 
1157
1157
*/
1158
1158
Time_zone *
1159
 
my_tz_find(THD *thd __attribute__((unused)),
 
1159
my_tz_find(Session *session __attribute__((unused)),
1160
1160
           const String *name __attribute__((unused)))
1161
1161
{
1162
1162
  return NULL;