← 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 21:20:24 UTC
  • Revision ID: brian@tangent.org-20080713212024-o6263c1vha7yxdeu
More bool removal. More cow bell!

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/drizzled.cc
199
199
/*
200
200
  Used with --help for detailed option
201
201
*/
202
 
static my_bool opt_help= 0, opt_verbose= 0;
 
202
static bool opt_help= 0, opt_verbose= 0;
203
203
 
204
204
arg_cmp_func Arg_comparator::comparator_matrix[5][2] =
205
205
{{&Arg_comparator::compare_string,     &Arg_comparator::compare_e_string},
220
220
static bool lower_case_table_names_used= 0;
221
221
static bool volatile select_thread_in_use, signal_thread_in_use;
222
222
static bool volatile ready_to_exit;
223
 
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
224
 
static my_bool opt_short_log_format= 0;
 
223
static bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
 
224
static bool opt_short_log_format= 0;
225
225
static uint kill_cached_threads, wake_thread;
226
226
static ulong killed_threads, thread_created;
227
227
static ulong max_used_connections;
250
250
bool opt_error_log= IF_WIN(1,0);
251
251
bool opt_disable_networking= false;
252
252
bool opt_skip_show_db= false;
253
 
my_bool opt_character_set_client_handshake= 1;
 
253
bool opt_character_set_client_handshake= 1;
254
254
bool server_id_supplied = 0;
255
255
bool opt_endinfo, using_udf_functions;
256
 
my_bool locked_in_memory;
 
256
bool locked_in_memory;
257
257
bool opt_using_transactions, using_update_log;
258
258
bool volatile abort_loop;
259
259
bool volatile shutdown_in_progress;
260
 
my_bool opt_skip_slave_start = 0; ///< If set, slave is not autostarted
261
 
my_bool opt_reckless_slave = 0;
262
 
my_bool opt_enable_named_pipe= 0;
 
260
bool opt_skip_slave_start = 0; ///< If set, slave is not autostarted
 
261
bool opt_reckless_slave = 0;
 
262
bool opt_enable_named_pipe= 0;
263
263
bool opt_local_infile;
264
264
bool opt_slave_compressed_protocol;
265
 
my_bool opt_safe_user_create = 0;
266
 
my_bool opt_show_slave_auth_info, opt_sql_bin_update = 0;
267
 
my_bool opt_log_slave_updates= 0;
 
265
bool opt_safe_user_create = 0;
 
266
bool opt_show_slave_auth_info, opt_sql_bin_update = 0;
 
267
bool opt_log_slave_updates= 0;
268
268
 
269
269
/*
270
270
  Legacy global handlerton. These will be removed (please do not add more).
273
273
handlerton *myisam_hton;
274
274
 
275
275
bool opt_readonly;
276
 
my_bool use_temp_pool;
 
276
bool use_temp_pool;
277
277
bool relay_log_purge;
278
278
bool opt_sync_frm;
279
279
bool opt_secure_auth= false;
280
280
char* opt_secure_file_priv= 0;
281
 
my_bool opt_log_slow_admin_statements= 0;
282
 
my_bool opt_log_slow_slave_statements= 0;
 
281
bool opt_log_slow_admin_statements= 0;
 
282
bool opt_log_slow_slave_statements= 0;
283
283
bool lower_case_file_system= 0;
284
 
my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
 
284
bool opt_old_style_user_limits= 0;
 
285
bool trust_function_creators= 0;
285
286
/*
286
287
  True if there is at least one per-hour limit for some user, so we should
287
288
  check them before each query (and possibly reset counters when hour is
288
289
  changed). False otherwise.
289
290
*/
290
291
volatile bool mqh_used = 0;
291
 
my_bool opt_noacl;
 
292
bool opt_noacl;
292
293
 
293
294
ulong opt_binlog_rows_event_max_size;
294
295
const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS};
460
461
 
461
462
static bool kill_in_progress, segfaulted;
462
463
#ifdef HAVE_STACK_TRACE_ON_SEGV
463
 
static my_bool opt_do_pstack;
 
464
static bool opt_do_pstack;
464
465
#endif /* HAVE_STACK_TRACE_ON_SEGV */
465
 
static my_bool opt_bootstrap, opt_myisam_log;
 
466
static bool opt_bootstrap, opt_myisam_log;
466
467
static int cleanup_done;
467
468
static ulong opt_specialflag, opt_myisam_block_size;
468
469
static char *opt_binlog_index_name;
4050
4051
  var->type= SHOW_MY_BOOL;
4051
4052
  pthread_mutex_lock(&LOCK_active_mi);
4052
4053
  var->value= buff;
4053
 
  *((my_bool *)buff)= (my_bool) (active_mi && active_mi->slave_running &&
 
4054
  *((bool *)buff)= (bool) (active_mi && active_mi->slave_running &&
4054
4055
                                 active_mi->rli.slave_running);
4055
4056
  pthread_mutex_unlock(&LOCK_active_mi);
4056
4057
  return 0;