← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
286
286
handlerton *heap_hton;
287
287
handlerton *myisam_hton;
288
288
 
289
 
bool opt_readonly;
290
289
bool use_temp_pool;
291
290
bool relay_log_purge;
292
291
char* opt_secure_file_priv= 0;
2751
2750
  OPT_RECORD_RND_BUFFER, OPT_DIV_PRECINCREMENT, OPT_RELAY_LOG_SPACE_LIMIT,
2752
2751
  OPT_RELAY_LOG_PURGE,
2753
2752
  OPT_SLAVE_NET_TIMEOUT, OPT_SLAVE_COMPRESSED_PROTOCOL, OPT_SLOW_LAUNCH_TIME,
2754
 
  OPT_SLAVE_TRANS_RETRIES, OPT_READONLY, OPT_DEBUGGING,
 
2753
  OPT_SLAVE_TRANS_RETRIES, OPT_DEBUGGING,
2755
2754
  OPT_SORT_BUFFER, OPT_TABLE_OPEN_CACHE, OPT_TABLE_DEF_CACHE,
2756
2755
  OPT_THREAD_CONCURRENCY, OPT_THREAD_CACHE_SIZE,
2757
2756
  OPT_TMP_TABLE_SIZE, OPT_THREAD_STACK,
3494
3493
    (char**) &max_system_variables.read_buff_size,0, GET_UINT, REQUIRED_ARG,
3495
3494
    128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, INT32_MAX, MALLOC_OVERHEAD, IO_SIZE,
3496
3495
    0},
3497
 
  {"read_only", OPT_READONLY,
3498
 
   N_("Make all non-temporary tables read-only, with the exception for "
3499
 
      "replication (slave) threads and users with the SUPER privilege"),
3500
 
   (char**) &opt_readonly,
3501
 
   (char**) &opt_readonly,
3502
 
   0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
3503
3496
  {"read_rnd_buffer_size", OPT_RECORD_RND_BUFFER,
3504
3497
   N_("When reading rows in sorted order after a sort, the rows are read "
3505
3498
      "through this buffer to avoid a disk seeks. If not set, then it's set "