← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Stewart Smith
  • Date: 2009-03-16 06:58:44 UTC
  • mto: (942.1.10 mordred)
  • mto: This revision was merged to the branch mainline in revision 940.
  • Revision ID: stewart@flamingspork.com-20090316065844-zjv6uh8a4i3coujc
yet more variable alignment/type fixes.

Makes status test pass on solaris sparc64

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
297
297
uint64_t aborted_threads;
298
298
uint64_t aborted_connects;
299
299
uint64_t max_connect_errors;
300
 
ulong thread_id=1L;
 
300
uint32_t thread_id=1L;
301
301
pid_t current_pid;
302
302
uint64_t slow_launch_threads= 0;
303
303
 
2684
2684
  {"Bytes_sent",               (char*) offsetof(STATUS_VAR, bytes_sent), SHOW_LONGLONG_STATUS},
2685
2685
  {"Com",                      (char*) com_status_vars, SHOW_ARRAY},
2686
2686
  {"Compression",              (char*) &show_net_compression_cont, SHOW_FUNC},
2687
 
  {"Connections",              (char*) &thread_id,              SHOW_LONG_NOFLUSH},
 
2687
  {"Connections",              (char*) &thread_id,          SHOW_INT_NOFLUSH},
2688
2688
  {"Created_tmp_disk_tables",  (char*) offsetof(STATUS_VAR, created_tmp_disk_tables), SHOW_LONG_STATUS},
2689
 
  {"Created_tmp_files",        (char*) &my_tmp_file_created,    SHOW_INT},
 
2689
  {"Created_tmp_files",        (char*) &my_tmp_file_created,SHOW_INT},
2690
2690
  {"Created_tmp_tables",       (char*) offsetof(STATUS_VAR, created_tmp_tables), SHOW_LONG_STATUS},
2691
 
  {"Flush_commands",           (char*) &refresh_version,        SHOW_LONG_NOFLUSH},
 
2691
  {"Flush_commands",           (char*) &refresh_version,    SHOW_INT_NOFLUSH},
2692
2692
  {"Handler_commit",           (char*) offsetof(STATUS_VAR, ha_commit_count), SHOW_LONG_STATUS},
2693
2693
  {"Handler_delete",           (char*) offsetof(STATUS_VAR, ha_delete_count), SHOW_LONG_STATUS},
2694
2694
  {"Handler_prepare",          (char*) offsetof(STATUS_VAR, ha_prepare_count),  SHOW_LONG_STATUS},
2712
2712
  {"Key_writes",               (char*) offsetof(KEY_CACHE, global_cache_write), SHOW_KEY_CACHE_LONGLONG},
2713
2713
  {"Last_query_cost",          (char*) offsetof(STATUS_VAR, last_query_cost), SHOW_DOUBLE_STATUS},
2714
2714
  {"Max_used_connections",     (char*) &max_used_connections,  SHOW_INT},
2715
 
  {"Open_files",               (char*) &my_file_opened,         SHOW_LONG_NOFLUSH},
2716
 
  {"Open_streams",             (char*) &my_stream_opened,       SHOW_LONG_NOFLUSH},
 
2715
  {"Open_files",               (char*) &my_file_opened,    SHOW_INT_NOFLUSH},
 
2716
  {"Open_streams",             (char*) &my_stream_opened,  SHOW_INT_NOFLUSH},
2717
2717
  {"Open_table_definitions",   (char*) &show_table_definitions_cont, SHOW_FUNC},
2718
2718
  {"Open_tables",              (char*) &show_open_tables_cont,       SHOW_FUNC},
2719
 
  {"Opened_files",             (char*) &my_file_total_opened, SHOW_LONG_NOFLUSH},
 
2719
  {"Opened_files",             (char*) &my_file_total_opened, SHOW_INT_NOFLUSH},
2720
2720
  {"Opened_tables",            (char*) offsetof(STATUS_VAR, opened_tables), SHOW_LONG_STATUS},
2721
2721
  {"Opened_table_definitions", (char*) offsetof(STATUS_VAR, opened_shares), SHOW_LONG_STATUS},
2722
2722
  {"Questions",                (char*) offsetof(STATUS_VAR, questions), SHOW_LONG_STATUS},
2734
2734
  {"Table_locks_immediate",    (char*) &locks_immediate,        SHOW_INT},
2735
2735
  {"Table_locks_waited",       (char*) &locks_waited,           SHOW_INT},
2736
2736
  {"Threads_connected",        (char*) &connection_count,       SHOW_INT},
2737
 
  {"Threads_created",          (char*) &thread_created,         SHOW_LONG_NOFLUSH},
 
2737
  {"Threads_created",          (char*) &thread_created,       SHOW_INT_NOFLUSH},
2738
2738
  {"Threads_running",          (char*) &thread_running,         SHOW_INT},
2739
2739
  {"Uptime",                   (char*) &show_starttime_cont,         SHOW_FUNC},
2740
2740
  {"Uptime_since_flush_status",(char*) &show_flushstatustime_cont,   SHOW_FUNC},