← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Brian Aker
  • Date: 2008-07-31 19:57:34 UTC
  • mfrom: (236.1.27 codestyle)
  • Revision ID: brian@tangent.org-20080731195734-c7cu4gx70xgjr68o
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
1259
1259
      else
1260
1260
        table->field[4]->store(command_name[tmp->command].str,
1261
1261
                               command_name[tmp->command].length, cs);
1262
 
      /* MYSQL_TIME */
 
1262
      /* DRIZZLE_TIME */
1263
1263
      table->field[5]->store((uint32_t)(tmp->start_time ?
1264
1264
                                      now - tmp->start_time : 0), true);
1265
1265
      /* STATE */
2793
2793
                                    LEX_STRING *table_name)
2794
2794
{
2795
2795
  const char *tmp_buff;
2796
 
  MYSQL_TIME time;
 
2796
  DRIZZLE_TIME time;
2797
2797
  CHARSET_INFO *cs= system_charset_info;
2798
2798
 
2799
2799
  restore_record(table, s->default_values);
2945
2945
      {
2946
2946
        thd->variables.time_zone->gmt_sec_to_TIME(&time,
2947
2947
                                                  (my_time_t) file->stats.create_time);
2948
 
        table->field[14]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
 
2948
        table->field[14]->store_time(&time, DRIZZLE_TIMESTAMP_DATETIME);
2949
2949
        table->field[14]->set_notnull();
2950
2950
      }
2951
2951
      if (file->stats.update_time)
2952
2952
      {
2953
2953
        thd->variables.time_zone->gmt_sec_to_TIME(&time,
2954
2954
                                                  (my_time_t) file->stats.update_time);
2955
 
        table->field[15]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
 
2955
        table->field[15]->store_time(&time, DRIZZLE_TIMESTAMP_DATETIME);
2956
2956
        table->field[15]->set_notnull();
2957
2957
      }
2958
2958
      if (file->stats.check_time)
2959
2959
      {
2960
2960
        thd->variables.time_zone->gmt_sec_to_TIME(&time,
2961
2961
                                                  (my_time_t) file->stats.check_time);
2962
 
        table->field[16]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
 
2962
        table->field[16]->store_time(&time, DRIZZLE_TIMESTAMP_DATETIME);
2963
2963
        table->field[16]->set_notnull();
2964
2964
      }
2965
2965
      if (file->ha_table_flags() & (ulong) HA_HAS_CHECKSUM)