← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/drizzled.cc

  • Committer: Brian Aker
  • Date: 2008-07-13 22:21:51 UTC
  • Revision ID: brian@tangent.org-20080713222151-fv2tcpbsc829j2oc
Ulonglong to uint64_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/drizzled.cc
50
50
#if SIZEOF_CHARP == 4
51
51
#define MAX_MEM_TABLE_SIZE ~(ulong) 0
52
52
#else
53
 
#define MAX_MEM_TABLE_SIZE ~(ulonglong) 0
 
53
#define MAX_MEM_TABLE_SIZE ~(uint64_t) 0
54
54
#endif
55
55
 
56
56
/* We have HAVE_purify below as this speeds up the shutdown of MySQL */
307
307
uint lower_case_table_names;
308
308
uint tc_heuristic_recover= 0;
309
309
uint volatile thread_count, thread_running;
310
 
ulonglong thd_startup_options;
 
310
uint64_t thd_startup_options;
311
311
ulong back_log, connect_timeout, server_id;
312
312
ulong table_cache_size, table_def_size;
313
313
ulong what_to_log;
3790
3790
   "Deprecated option",
3791
3791
   (char**) &global_system_variables.myisam_max_extra_sort_file_size,
3792
3792
   (char**) &max_system_variables.myisam_max_extra_sort_file_size,
3793
 
   0, GET_ULL, REQUIRED_ARG, (ulonglong) MI_MAX_TEMP_LENGTH,
3794
 
   0, (ulonglong) MAX_FILE_SIZE, 0, 1, 0},
 
3793
   0, GET_ULL, REQUIRED_ARG, (uint64_t) MI_MAX_TEMP_LENGTH,
 
3794
   0, (uint64_t) MAX_FILE_SIZE, 0, 1, 0},
3795
3795
  {"myisam_max_sort_file_size", OPT_MYISAM_MAX_SORT_FILE_SIZE,
3796
3796
   "Don't use the fast sort index method to created index if the temporary file would get bigger than this.",
3797
3797
   (char**) &global_system_variables.myisam_max_sort_file_size,
3798
3798
   (char**) &max_system_variables.myisam_max_sort_file_size, 0,
3799
 
   GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, (ulonglong) MAX_FILE_SIZE,
 
3799
   GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, (uint64_t) MAX_FILE_SIZE,
3800
3800
   0, 1024*1024, 0},
3801
3801
  {"myisam_repair_threads", OPT_MYISAM_REPAIR_THREADS,
3802
3802
   "Number of threads to use when repairing MyISAM tables. The value of 1 disables parallel repair.",
4394
4394
  default_storage_engine_str= (char*) "MyISAM";
4395
4395
  global_system_variables.table_plugin= NULL;
4396
4396
  global_system_variables.tx_isolation= ISO_REPEATABLE_READ;
4397
 
  global_system_variables.select_limit= (ulonglong) HA_POS_ERROR;
4398
 
  max_system_variables.select_limit=    (ulonglong) HA_POS_ERROR;
4399
 
  global_system_variables.max_join_size= (ulonglong) HA_POS_ERROR;
4400
 
  max_system_variables.max_join_size=   (ulonglong) HA_POS_ERROR;
 
4397
  global_system_variables.select_limit= (uint64_t) HA_POS_ERROR;
 
4398
  max_system_variables.select_limit=    (uint64_t) HA_POS_ERROR;
 
4399
  global_system_variables.max_join_size= (uint64_t) HA_POS_ERROR;
 
4400
  max_system_variables.max_join_size=   (uint64_t) HA_POS_ERROR;
4401
4401
  global_system_variables.old_alter_table= 0;
4402
4402
  global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC;
4403
4403
  /*